Skip to content

Commit

Permalink
Drop latest XProcessing jars into Dagger.
Browse files Browse the repository at this point in the history
The latest XProcessing jars require an update to Kotln and KSP dependency, so I've updated those in our gradle tests.

RELNOTES=Drop latest XProcessing jars. Requires users to update to KSP 1.9.24-1.0.20
PiperOrigin-RevId: 658533119
  • Loading branch information
bcorso authored and Dagger Team committed Aug 1, 2024
1 parent 4dcf006 commit da92d19
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ http_archive(

load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version")

KOTLIN_VERSION = "1.9.23"
KOTLIN_VERSION = "1.9.24"

# Get from https://github.com/JetBrains/kotlin/releases/
KOTLINC_RELEASE_SHA = "93137d3aab9afa9b27cb06a824c2324195c6b6f6179d8a8653f440f5bd58be88"
KOTLINC_RELEASE_SHA = "eb7b68e01029fa67bc8d060ee54c12018f2c60ddc438cf21db14517229aa693b"

kotlin_repositories(
compiler_release = kotlinc_version(
Expand Down Expand Up @@ -203,7 +203,7 @@ GRPC_VERSION = "1.2.0"

INCAP_VERSION = "0.2"

KSP_VERSION = KOTLIN_VERSION + "-1.0.19"
KSP_VERSION = KOTLIN_VERSION + "-1.0.20"

MAVEN_VERSION = "3.3.3"

Expand Down
4 changes: 2 additions & 2 deletions java/dagger/hilt/android/plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
buildscript {
ext {
kotlin_version = "1.9.20"
kotlin_version = "1.9.24"
agp_version = System.getenv('AGP_VERSION') ?: "7.2.0"
ksp_version = "$kotlin_version-1.0.14"
ksp_version = "$kotlin_version-1.0.20"
pluginArtifactId = 'hilt-android-gradle-plugin'
pluginId = 'com.google.dagger.hilt.android'
}
Expand Down
Binary file modified java/dagger/internal/codegen/xprocessing/xprocessing.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions javatests/artifacts/dagger-android-ksp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
buildscript {
ext {
agp_version = "8.1.0"
kotlin_version = "1.9.20"
ksp_version = "$kotlin_version-1.0.14"
kotlin_version = "1.9.24"
ksp_version = "$kotlin_version-1.0.20"
}
repositories {
google()
Expand Down
4 changes: 2 additions & 2 deletions javatests/artifacts/dagger-ksp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
buildscript {
ext {
dagger_version = "LOCAL-SNAPSHOT"
kotlin_version = "1.9.20"
ksp_version = "$kotlin_version-1.0.14"
kotlin_version = "1.9.24"
ksp_version = "$kotlin_version-1.0.20"
junit_version = "4.13"
truth_version = "1.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions javatests/artifacts/dagger/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
buildscript {
ext {
dagger_version = "LOCAL-SNAPSHOT"
kotlin_version = "1.9.20"
ksp_version = "$kotlin_version-1.0.14"
kotlin_version = "1.9.24"
ksp_version = "$kotlin_version-1.0.20"
junit_version = "4.13"
truth_version = "1.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion javatests/artifacts/dagger/lazyclasskey/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
dagger_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.20'
kotlin_version = '1.9.24'
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion javatests/artifacts/hilt-android/lazyclasskey/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20'
kotlin_version = '1.9.24'
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion javatests/artifacts/hilt-android/simple/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
buildscript {
ext {
dagger_version = 'LOCAL-SNAPSHOT'
kotlin_version = '1.9.20'
kotlin_version = '1.9.24'
agp_version = System.getenv('AGP_VERSION') ?: "7.1.2"
}
repositories {
Expand Down
4 changes: 2 additions & 2 deletions javatests/artifacts/hilt-android/simpleKotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

buildscript {
ext {
kotlin_version = '1.9.20'
ksp_version = "$kotlin_version-1.0.14"
kotlin_version = '1.9.24'
ksp_version = "$kotlin_version-1.0.20"
agp_version = System.getenv('AGP_VERSION') ?: "7.1.2"
}
repositories {
Expand Down
2 changes: 1 addition & 1 deletion javatests/artifacts/hilt-android/viewmodel/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.20'
kotlin_version = '1.9.24'
}
repositories {
google()
Expand Down

0 comments on commit da92d19

Please sign in to comment.