Skip to content

Commit d2386a0

Browse files
authored
Merge branch 'master' into cramsan/storage_jvm
2 parents e9bf4e5 + 5c91a6c commit d2386a0

File tree

4 files changed

+45
-50
lines changed

4 files changed

+45
-50
lines changed

.github/workflows/pull_request.yml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,11 @@ on:
77
pull_request:
88
branches: [ master ]
99

10+
concurrency:
11+
group: ci-pull-request-${{ github.head_ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
11-
lint:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- uses: actions/checkout@v4
15-
- name: Set up JDK
16-
uses: actions/setup-java@v4
17-
with:
18-
distribution: 'zulu'
19-
java-version: '17'
20-
- name: ktLint
21-
run: ./gradlew lintKotlin
22-
apiCheck:
23-
runs-on: ubuntu-latest
24-
steps:
25-
- uses: actions/checkout@v4
26-
- name: Set up JDK
27-
uses: actions/setup-java@v4
28-
with:
29-
distribution: 'zulu'
30-
java-version: '17'
31-
- name: Run Api Check
32-
run: ./gradlew apiCheck
3315
jobMatrixSetup:
3416
runs-on: macos-latest
3517
outputs:
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Lint and API Checks
2+
3+
on:
4+
pull_request_target:
5+
branches: [ master ]
6+
7+
concurrency:
8+
group: ci-lint-api-check-${{ github.head_ref }}
9+
cancel-in-progress: true
10+
11+
jobs:
12+
lintAndApiChecks:
13+
runs-on: macos-latest
14+
permissions:
15+
contents: write
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Set up JDK
19+
uses: actions/setup-java@v4
20+
with:
21+
distribution: 'zulu'
22+
java-version: '17'
23+
cache: gradle
24+
- name: Cocoapods cache
25+
uses: actions/cache@v4
26+
with:
27+
path: |
28+
~/.cocoapods
29+
~/Library/Caches/CocoaPods
30+
*/build/cocoapods
31+
*/build/classes
32+
key: cocoapods-cache-v2
33+
- uses: maxim-lobanov/setup-xcode@v1
34+
with:
35+
xcode-version: latest-stable
36+
- name: Format Kotlin
37+
run: ./gradlew formatKotlin
38+
- name: Api File Update
39+
run: ./gradlew apiDump
40+
- uses: stefanzweifel/git-auto-commit-action@v6

.github/workflows/push.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ androidx-test-junit = "1.3.0"
55
androidx-test-runner = "1.7.0"
66
ben-manes-versions = "0.52.0"
77
firebase-bom = "33.10.0"
8-
gitlive-firebase-java-sdk = "0.4.6"
8+
gitlive-firebase-java-sdk = "0.6.1"
99
gson = "2.13.1"
1010
junit = "4.13.2"
1111
kotlin = "2.2.0"

0 commit comments

Comments
 (0)