Skip to content

Commit 7ce9d43

Browse files
committed
Update KSP to 1.8.20-1.0.11
Also remove Room KSP tasks from 'don't try rerunning tasks' list added as a workaround for b/275795136. Bug: 275795136 Test: ./gradlew bOS Change-Id: Ifcb21586871d366b3035dba456f53b78e085ccd2
1 parent df4d25a commit 7ce9d43

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,6 @@ val DONT_TRY_RERUNNING_TASKS = setOf(
147147
"partiallyDejetifyArchive",
148148
"stripArchiveForPartialDejetification",
149149
"createArchive",
150-
151-
// b/275795136
152-
":room:integration-tests:room-testapp-kotlin:kspWithKspGenJavaDebugAndroidTestKotlin",
153-
// b/275795136
154-
":room:integration-tests:room-testapp-kotlin:kspWithKspGenKotlinDebugAndroidTestKotlin"
155150
)
156151

157152
val DONT_TRY_RERUNNING_TASK_TYPES = setOf(

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ kotlinNative = "1.8.21"
4242
kotlinCompileTesting = "1.4.9"
4343
kotlinCoroutines = "1.6.4"
4444
kotlinSerialization = "1.3.3"
45-
ksp = "1.8.20-1.0.10"
45+
ksp = "1.8.20-1.0.11"
4646
ktlint = "0.46.0-20220520.192227-74"
4747
leakcanary = "2.8.1"
4848
media3 = "1.0.0-beta03"

room/scripts/update_ksp.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ repo start $BRANCH_NAME . platform/prebuilts/androidx/external
4141
# other projects depend on ksp prebuilts so we don't delete them anymore.
4242

4343
# download
44-
development/importMaven/import_maven_artifacts.py -n com.google.devtools.ksp:symbol-processing-gradle-plugin:$KSP_VERSION
45-
development/importMaven/import_maven_artifacts.py -n com.google.devtools.ksp:symbol-processing:$KSP_VERSION
44+
development/importMaven/importMaven.sh com.google.devtools.ksp:symbol-processing-gradle-plugin:$KSP_VERSION
45+
development/importMaven/importMaven.sh com.google.devtools.ksp:symbol-processing:$KSP_VERSION
4646

4747
# update build version
4848
sed -i '' "s/ksp = \".*\"/ksp = \"$KSP_VERSION\"/" gradle/libs.versions.toml

0 commit comments

Comments
 (0)