Skip to content

Commit 4f3662e

Browse files
committed
deps: modernize to AGP 9.2.1 + Gradle 9.6.1 + Kotlin 2.4.0
Coordinated major upgrade that resolves all open Dependabot PRs. AGP 9 has built-in Kotlin support, so the separate org.jetbrains.kotlin.android plugin is removed. Also bumps CI actions (checkout v7, setup-java v5, setup-android v4, upload-artifact v7, action-gh-release v3) and build-tools to 36.0.0. Build + 22 unit tests pass; .aar output unchanged. Signed-off-by: Alexander Salas Bastidas <ajsb85@firechip.dev>
1 parent 673a579 commit 4f3662e

5 files changed

Lines changed: 14 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ jobs:
1818
name: Build and test
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
22-
- uses: actions/setup-java@v4
21+
- uses: actions/checkout@v7
22+
- uses: actions/setup-java@v5
2323
with:
2424
distribution: temurin
2525
java-version: "17"
26-
- uses: android-actions/setup-android@v3
26+
- uses: android-actions/setup-android@v4
2727
- name: Install SDK packages
28-
run: sdkmanager "platforms;android-35" "build-tools;35.0.0"
28+
run: sdkmanager "platforms;android-35" "build-tools;36.0.0"
2929
- name: Test and assemble
3030
run: ./gradlew :cobs:testDebugUnitTest :cobs:assembleRelease --console=plain
3131
- name: Upload AAR artifact
32-
uses: actions/upload-artifact@v4
32+
uses: actions/upload-artifact@v7
3333
with:
3434
name: cobs_codec_kt-aar
3535
path: cobs/build/outputs/aar/*.aar

.github/workflows/release-aar.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
name: Build AAR and attach to release
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-java@v4
17+
- uses: actions/checkout@v7
18+
- uses: actions/setup-java@v5
1919
with:
2020
distribution: temurin
2121
java-version: "17"
22-
- uses: android-actions/setup-android@v3
22+
- uses: android-actions/setup-android@v4
2323
- name: Install SDK packages
24-
run: sdkmanager "platforms;android-35" "build-tools;35.0.0"
24+
run: sdkmanager "platforms;android-35" "build-tools;36.0.0"
2525
- name: Build AAR and run unit tests
2626
run: ./gradlew :cobs:testDebugUnitTest :cobs:assembleRelease --console=plain
2727
- name: Stage artifact
@@ -33,13 +33,13 @@ jobs:
3333
cp cobs/build/outputs/aar/cobs-release.aar "dist/cobs_codec_kt-${version}.aar"
3434
echo "version=$version" >> "$GITHUB_OUTPUT"
3535
- name: Upload as workflow artifact
36-
uses: actions/upload-artifact@v4
36+
uses: actions/upload-artifact@v7
3737
with:
3838
name: cobs_codec_kt-aar-release
3939
path: dist/*.aar
4040
- name: Attach to GitHub release
4141
if: startsWith(github.ref, 'refs/tags/')
42-
uses: softprops/action-gh-release@v2
42+
uses: softprops/action-gh-release@v3
4343
with:
4444
files: dist/*.aar
4545
name: cobs_codec_kt ${{ steps.stage.outputs.version }}

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
plugins {
2-
id("com.android.library") version "8.7.3" apply false
3-
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
2+
// AGP 9 has built-in Kotlin support; no separate Kotlin plugin needed.
3+
id("com.android.library") version "9.2.1" apply false
44
}

cobs/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
plugins {
44
id("com.android.library")
5-
id("org.jetbrains.kotlin.android")
65
}
76

87
android {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)