upgrade AGP to 8.7.1

kostasdrakonakis · Oct 19, 2024 · 261518c · 261518c
1 parent 84f1fdb
commit 261518c
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 22 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 18
+    - name: set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '18'
+        java-version: '21'
         distribution: 'temurin'
         cache: gradle
 

diff --git a/android-navigator-annotations/build.gradle b/android-navigator-annotations/build.gradle
@@ -1,5 +1,11 @@
 apply plugin: 'java-library'
+apply plugin: 'kotlin'
+apply plugin: 'kotlin-kapt'
+
 java {
-    sourceCompatibility = JavaVersion.VERSION_18
-    targetCompatibility = JavaVersion.VERSION_18
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+kotlin {
+    jvmToolchain(21)
 }
diff --git a/android-navigator-compiler/build.gradle b/android-navigator-compiler/build.gradle
@@ -7,18 +7,21 @@ dependencies {
     implementation 'com.squareup:javapoet:1.13.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'com.google.guava:guava:33.0.0-jre'
+    implementation 'com.google.guava:guava:33.3.1-jre'
     compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
     kapt 'com.google.auto.service:auto-service:1.1.1'
     compileOnly 'net.ltgt.gradle.incap:incap:1.0.0'
     kapt 'net.ltgt.gradle.incap:incap-processor:1.0.0'
     implementation project(':android-navigator-annotations')
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.google.truth:truth:1.4.2'
+    testImplementation 'com.google.truth:truth:1.4.4'
     testImplementation 'com.google.testing.compile:compile-testing:0.21.0'
 }
+kotlin {
+    jvmToolchain(21)
+}
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_18
-    targetCompatibility = JavaVersion.VERSION_18
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
diff --git a/android-navigator/build.gradle b/android-navigator/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdk 34
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 21
         targetSdkVersion 34
     }
 
@@ -16,16 +16,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_18
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+    kotlin {
+        jvmToolchain(21)
     }
     namespace 'com.github.kostasdrakonakis.androidnavigator'
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.annotation:annotation:1.7.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.annotation:annotation:1.9.0'
     api project(':android-navigator-annotations')
-    implementation "androidx.core:core-ktx:1.12.0"
+    implementation "androidx.core:core-ktx:1.13.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdk 34
     defaultConfig {
         applicationId "com.github.kostasdrakonakis.example"
-        minSdkVersion 15
+        minSdkVersion 21
         targetSdkVersion 34
         versionCode 1
         versionName "1.0"
@@ -18,15 +18,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_18
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+    kotlin {
+        jvmToolchain(21)
     }
     namespace 'com.github.kostasdrakonakis.example'
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
 //    implementation 'com.github.kostasdrakonakis:android-navigator:1.2.6'
 //    kapt 'com.github.kostasdrakonakis:android-navigator-compiler:1.2.6'
     implementation project(':android-navigator')

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.9.22'
+    ext.kotlin_version = '2.0.21'
     ext.dokka_version = '1.9.10'
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath 'com.adarshr:gradle-test-logger-plugin:4.0.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip