Skip to content

Commit 115f841

Browse files
nbransbynbransby
authored
Merge branch 'master' into make-android-ios-js-properties-extensions
2 parents c0463cd + a0599d7 commit 115f841

File tree

143 files changed

+4302
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+4302
-826
lines changed

‎.github/actions/setup_test_action/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: "composite"
66
steps:
77
- name: Set up JDK
8-
uses: actions/setup-java@v3
8+
uses: actions/setup-java@v4
99
with:
1010
distribution: 'zulu'
1111
java-version: '17'

‎.github/workflows/publish.yml‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ env:
1515

1616
jobs:
1717
build:
18-
runs-on: macos-13
18+
runs-on: macos-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Set up JDK
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
distribution: 'zulu'
2525
java-version: '17'
@@ -28,12 +28,16 @@ jobs:
2828
run: ./gradlew :updateVersions
2929
- name: Grant execute permission for gradlew
3030
run: chmod +x gradlew
31+
- name: Publish Firebase Analytics
32+
run: ./gradlew :firebase-analytics:publish
3133
- name: Publish Firebase App
3234
run: ./gradlew :firebase-app:publish
3335
- name: Publish Firebase Auth
3436
run: ./gradlew :firebase-auth:publish
3537
- name: Publish Firebase Common
3638
run: ./gradlew :firebase-common:publish
39+
- name: Publish Firebase Common Internal
40+
run: ./gradlew :firebase-common-internal:publish
3741
- name: Publish Firebase Config
3842
run: ./gradlew :firebase-config:publish
3943
- name: Publish Firebase Database
@@ -42,11 +46,38 @@ jobs:
4246
run: ./gradlew :firebase-firestore:publish
4347
- name: Publish Firebase Functions
4448
run: ./gradlew :firebase-functions:publish
49+
- name: Publish Firebase Messaging
50+
run: ./gradlew :firebase-messaging:publish
4551
- name: Publish Firebase Storage
4652
run: ./gradlew :firebase-storage:publish
4753
- name: Publish Firebase Installations
4854
run: ./gradlew :firebase-installations:publish
4955
- name: Publish Firebase Performance
5056
run: ./gradlew :firebase-perf:publish
5157
- name: Publish Firebase Crashlytics
52-
run: ./gradlew :firebase-crashlytics:publish
58+
run: ./gradlew :firebase-crashlytics:publish
59+
documentation:
60+
runs-on: macos-13
61+
steps:
62+
- uses: actions/checkout@v4
63+
- name: Set up JDK
64+
uses: actions/setup-java@v4
65+
with:
66+
distribution: 'zulu'
67+
java-version: '17'
68+
- uses: gradle/gradle-build-action@v2
69+
- name: Grant execute permission for gradlew
70+
run: chmod +x gradlew
71+
- name: Generate documentation
72+
run: ./gradlew dokkaHtmlMultiModule
73+
- name: Uploading build folder
74+
uses: actions/upload-artifact@v4
75+
with:
76+
name: artefact
77+
path: build/dokka/htmlMultiModule
78+
- name: Deploy API documentation to Github Pages
79+
uses: JamesIves/github-pages-deploy-action@v4
80+
with:
81+
branch: gh-pages
82+
folder: build/dokka/htmlMultiModule
83+
target-folder: docs

‎.github/workflows/pull_request.yml‎

Lines changed: 69 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,69 +8,67 @@ on:
88
branches: [ master ]
99

1010
jobs:
11+
jobEmulatorMatrixSetup:
12+
runs-on: ubuntu-latest
13+
outputs:
14+
emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }}
15+
steps:
16+
- uses: actions/checkout@v4
17+
- name: Set up JDK
18+
uses: actions/setup-java@v4
19+
with:
20+
distribution: 'zulu'
21+
java-version: '17'
22+
cache: gradle
23+
- name: Prepare the matrix JSON
24+
run: ./gradlew ciEmulatorJobsMatrixSetup
25+
- id: dataStep
26+
run: echo "emulator_jobs_matrix=$(jq -c . < ./build/emulator_jobs_matrix.json)" >> $GITHUB_OUTPUT
1127
build-android:
12-
runs-on: macos-13
28+
needs: jobEmulatorMatrixSetup
29+
runs-on: ubuntu-latest
1330
strategy:
14-
matrix:
15-
api-level: [ 34 ]
31+
fail-fast: false
32+
matrix: ${{ fromJson(needs.jobEmulatorMatrixSetup.outputs.emulator_jobs_matrix) }}
1633
steps:
17-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
35+
- name: Enable KVM group perms
36+
run: |
37+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
38+
sudo udevadm control --reload-rules
39+
sudo udevadm trigger --name-match=kvm
1840
- name: Setup test environment
1941
uses: ./.github/actions/setup_test_action
20-
- name: AVD cache
21-
uses: actions/cache@v3
22-
id: avd-cache
23-
with:
24-
path: |
25-
~/.android/avd/*
26-
~/.android/adb*
27-
key: avd-${{ matrix.api-level }}-${{ runner.os }}-${{ runner.arch }}
28-
- name: create AVD and generate snapshot for caching
29-
if: steps.avd-cache.outputs.cache-hit != 'true'
30-
uses: reactivecircus/android-emulator-runner@v2
31-
with:
32-
api-level: ${{ matrix.api-level }}
33-
arch: x86_64
34-
target: google_apis
35-
avd-name: pixel6_API${{ matrix.api-level }}
36-
force-avd-creation: false
37-
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
38-
disable-animations: false
39-
script: echo "Generated AVD snapshot for caching."
42+
- name: Set Artifact Name
43+
run: |
44+
echo "ARCHIVE_KEY=$(echo ${{ matrix.gradle_tasks }} | cut -d: -f2)" >> $GITHUB_ENV
45+
- name: Apply Android licenses
46+
run: ./gradlew ciSdkManagerLicenses
4047
- name: Run Android Instrumented Tests
41-
uses: reactivecircus/android-emulator-runner@v2
42-
with:
43-
api-level: ${{ matrix.api-level }}
44-
arch: x86_64
45-
target: google_apis
46-
avd-name: pixel6_API${{ matrix.api-level }}
47-
force-avd-creation: false
48-
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
49-
disable-animations: true
50-
script: ./gradlew connectedAndroidTest
48+
run: ./gradlew ${{ matrix.gradle_tasks }}
5149
- name: Upload Android test artifact
52-
uses: actions/upload-artifact@v3
50+
uses: actions/upload-artifact@v4
5351
if: failure()
5452
with:
55-
name: "Android Test Report HTML"
53+
name: Android ${{ env.ARCHIVE_KEY }} Test Report HTML
5654
path: "**/build/reports/androidTests/"
5755
- name: Upload Firebase Debug Log
58-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
5957
if: failure()
6058
with:
61-
name: "Firebase Debug Log"
59+
name: Android ${{ env.ARCHIVE_KEY }} Firebase Debug Log
6260
path: "**/firebase-debug.log"
6361
build-js:
6462
runs-on: ubuntu-latest
6563
steps:
66-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6765
- name: Setup test environment
6866
uses: ./.github/actions/setup_test_action
6967
timeout-minutes: 10
7068
- name: Run JS Tests
7169
run: ./gradlew cleanTest jsTest
7270
- name: Upload JS test artifact
73-
uses: actions/upload-artifact@v3
71+
uses: actions/upload-artifact@v4
7472
if: failure()
7573
with:
7674
name: "JS Test Report HTML"
@@ -79,17 +77,17 @@ jobs:
7977
**/build/reports/tests/jsBrowserTest/
8078
**/build/reports/tests/jsNodeTest/
8179
- name: Upload Firebase Debug Log
82-
uses: actions/upload-artifact@v3
80+
uses: actions/upload-artifact@v4
8381
if: failure()
8482
with:
85-
name: "Firebase Debug Log"
83+
name: "JS Firebase Debug Log"
8684
path: "**/firebase-debug.log"
8785
build-ios:
8886
runs-on: macos-latest
8987
steps:
90-
- uses: actions/checkout@v3
88+
- uses: actions/checkout@v4
9189
- name: Cocoapods cache
92-
uses: actions/cache@v3
90+
uses: actions/cache@v4
9391
with:
9492
path: |
9593
~/.cocoapods
@@ -100,16 +98,38 @@ jobs:
10098
- name: Setup test environment
10199
uses: ./.github/actions/setup_test_action
102100
- name: Run iOS Tests
103-
run: ./gradlew cleanTest iosX64Test
101+
run: ./gradlew cleanTest iosSimulatorArm64Test
104102
- name: Upload iOS test artifact
105-
uses: actions/upload-artifact@v3
103+
uses: actions/upload-artifact@v4
106104
if: failure()
107105
with:
108106
name: "iOS Test Report HTML"
109-
path: "**/build/reports/tests/iosX64Test/"
107+
path: "**/build/reports/tests/iosSimulatorArm64Test/"
110108
- name: Upload Firebase Debug Log
111-
uses: actions/upload-artifact@v3
109+
uses: actions/upload-artifact@v4
112110
if: failure()
113111
with:
114-
name: "Firebase Debug Log"
112+
name: "iOS Firebase Debug Log"
115113
path: "**/firebase-debug.log"
114+
build-jvm:
115+
runs-on: ubuntu-latest
116+
steps:
117+
- uses: actions/checkout@v4
118+
- name: Setup test environment
119+
uses: ./.github/actions/setup_test_action
120+
timeout-minutes: 10
121+
- name: Run JVM Tests
122+
run: ./gradlew cleanTest jvmTest
123+
- name: Upload JVM test artifact
124+
uses: actions/upload-artifact@v4
125+
if: failure()
126+
with:
127+
name: "JVM Test Report HTML"
128+
path: |
129+
**/build/reports/tests/jvmTest/
130+
- name: Upload Firebase Debug Log
131+
uses: actions/upload-artifact@v4
132+
if: failure()
133+
with:
134+
name: "JVM Firebase Debug Log"
135+
path: "**/firebase-debug.log"

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project exclude paths
2-
/.gradle/
2+
/**/.gradle/
33
/**/build/
44
/.idea/
55
local.properties
@@ -11,3 +11,5 @@ Firebase*.zip
1111
*.log
1212
/kotlin-js-store/
1313
/kotlin-js-store/yarn.lock
14+
15+
.kotlin/

0 commit comments

Comments
 (0)