Upgrade Dagger's dependencies of kotlin to 1.9.20 and ksp to `1.9.2…

…0-1.0.14`. This should bring in a number of fixes in KSP, especially related to incremental processing. Fixes #4060 RELNOTES=Upgrade Dagger's dependencies of kotlin to `1.9.20` and ksp to `1.9.20-1.0.14`. PiperOrigin-RevId: 586435985
google · Nov 29, 2023 · 692015f · 692015f
1 parent cd70dea
commit 692015f
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,9 +13,9 @@ env:
   USE_JAVA_VERSION: '11'
   # This is required by AGP 8.3+.
   USE_JAVA_VERSION_FOR_PLUGIN: '17'
-  # Our Bazel builds currently rely on 6.3.2. The version is set via
+  # Our Bazel builds currently rely on 6.4.0. The version is set via
   # baselisk by USE_BAZEL_VERSION: https://github.com/bazelbuild/bazelisk.
-  USE_BAZEL_VERSION: '6.3.2'
+  USE_BAZEL_VERSION: '6.4.0'
   # The default Maven 3.9.0 has a regression so we manually install 3.8.7.
   # https://issues.apache.org/jira/browse/MNG-7679
   USE_MAVEN_VERSION: '3.8.7'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,9 +12,9 @@ env:
   USE_JAVA_VERSION: '11'
   # This is required by AGP 8.3+.
   USE_JAVA_VERSION_FOR_PLUGIN: '17'
-  # Our Bazel builds currently rely on 6.3.2. The version is set via
+  # Our Bazel builds currently rely on 6.4.0. The version is set via
   # baselisk by USE_BAZEL_VERSION: https://github.com/bazelbuild/bazelisk.
-  USE_BAZEL_VERSION: '6.3.2'
+  USE_BAZEL_VERSION: '6.4.0'
   DAGGER_RELEASE_VERSION: "${{ github.event.inputs.dagger_release_version }}"
   # The default Maven 3.9.0 has a regression so we manually install 3.8.7.
   # https://issues.apache.org/jira/browse/MNG-7679

diff --git a/WORKSPACE b/WORKSPACE
@@ -119,10 +119,10 @@ http_archive(
 
 load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version")
 
-KOTLIN_VERSION = "1.9.0"
+KOTLIN_VERSION = "1.9.20"
 
 # Get from https://github.com/JetBrains/kotlin/releases/
-KOTLINC_RELEASE_SHA = "1fc50d805f9809e92de43e91f089cc8618567c1a350faebdabf8a40c5048bee8"
+KOTLINC_RELEASE_SHA = "15a8a2825b74ccf6c44e04e97672db802d2df75ce2fbb63ef0539bf3ae5006f0"
 
 kotlin_repositories(
     compiler_release = kotlinc_version(
@@ -171,7 +171,7 @@ CHECKER_FRAMEWORK_VERSION = "2.5.3"
 
 ERROR_PRONE_VERSION = "2.14.0"
 
-KSP_VERSION = KOTLIN_VERSION + "-1.0.12"
+KSP_VERSION = KOTLIN_VERSION + "-1.0.14"
 
 maven_install(
     artifacts = [

diff --git a/java/dagger/hilt/android/plugin/build.gradle b/java/dagger/hilt/android/plugin/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
   ext {
-    kotlin_version = "1.9.0"
+    kotlin_version = "1.9.20"
     agp_version = System.getenv('AGP_VERSION') ?: "7.2.0"
-    ksp_version = "$kotlin_version-1.0.12"
+    ksp_version = "$kotlin_version-1.0.14"
     pluginArtifactId = 'hilt-android-gradle-plugin'
     pluginId = 'com.google.dagger.hilt.android'
   }

diff --git a/java/dagger/internal/codegen/xprocessing/xprocessing-testing.jar b/java/dagger/internal/codegen/xprocessing/xprocessing-testing.jar
diff --git a/java/dagger/internal/codegen/xprocessing/xprocessing.jar b/java/dagger/internal/codegen/xprocessing/xprocessing.jar
diff --git a/javatests/artifacts/dagger-android-ksp/build.gradle b/javatests/artifacts/dagger-android-ksp/build.gradle
@@ -17,8 +17,8 @@
 buildscript {
     ext {
         agp_version = "8.1.0"
-        kotlin_version = "1.9.0"
-        ksp_version = "$kotlin_version-1.0.12"
+        kotlin_version = "1.9.20"
+        ksp_version = "$kotlin_version-1.0.14"
     }
     repositories {
         google()

diff --git a/javatests/artifacts/dagger-ksp/build.gradle b/javatests/artifacts/dagger-ksp/build.gradle
@@ -17,8 +17,8 @@
 buildscript {
   ext {
     dagger_version = "LOCAL-SNAPSHOT"
-    kotlin_version = "1.9.0"
-    ksp_version = "$kotlin_version-1.0.12"
+    kotlin_version = "1.9.20"
+    ksp_version = "$kotlin_version-1.0.14"
     junit_version = "4.13"
     truth_version = "1.0.1"
   }
@@ -27,6 +27,7 @@ buildscript {
     mavenLocal()
   }
   dependencies {
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$ksp_version")
   }
 }

diff --git a/javatests/artifacts/dagger/build.gradle b/javatests/artifacts/dagger/build.gradle
@@ -17,8 +17,8 @@
 buildscript {
   ext {
     dagger_version = "LOCAL-SNAPSHOT"
-    kotlin_version = "1.9.0"
-    ksp_version = "$kotlin_version-1.0.12"
+    kotlin_version = "1.9.20"
+    ksp_version = "$kotlin_version-1.0.14"
     junit_version = "4.13"
     truth_version = "1.0.1"
   }

diff --git a/javatests/artifacts/hilt-android/simple/build.gradle b/javatests/artifacts/hilt-android/simple/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         dagger_version = 'LOCAL-SNAPSHOT'
-        kotlin_version = '1.9.0'
+        kotlin_version = '1.9.20'
         agp_version = System.getenv('AGP_VERSION') ?: "7.1.2"
     }
     repositories {

diff --git a/javatests/artifacts/hilt-android/simpleKotlin/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/build.gradle
@@ -16,8 +16,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.9.0'
-        ksp_version = "$kotlin_version-1.0.12"
+        kotlin_version = '1.9.20'
+        ksp_version = "$kotlin_version-1.0.14"
         agp_version = System.getenv('AGP_VERSION') ?: "7.1.2"
     }
     repositories {

diff --git a/javatests/artifacts/hilt-android/viewmodel/build.gradle b/javatests/artifacts/hilt-android/viewmodel/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         hilt_version = 'LOCAL-SNAPSHOT'
         // AGP is set below 7.2.0 on purpose to be able to obfuscate debug apk.
         agp_version = "7.1.2"
-        kotlin_version = '1.9.0'
+        kotlin_version = '1.9.20'
     }
     repositories {
         google()