Skip to content

Commit

Permalink
Update versions of compose compiler + kotlin (#1228)
Browse files Browse the repository at this point in the history
  • Loading branch information
bentrengrove committed Nov 27, 2023
2 parents 3251fcd + a2e17e0 commit e52dfd0
Show file tree
Hide file tree
Showing 11 changed files with 152 additions and 152 deletions.
4 changes: 2 additions & 2 deletions Crane/benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

android {
namespace = "androidx.compose.samples.crane.benchmark"
compileSdk = 33
compileSdk = libs.versions.compileSdk.get().toInt()

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -18,7 +18,7 @@ android {

defaultConfig {
minSdk = 23
targetSdk = 33
targetSdk = libs.versions.targetSdk.get().toInt()

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
30 changes: 15 additions & 15 deletions Crane/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ accompanist = "0.32.0"
androidGradlePlugin = "8.1.4"
androidx-activity-compose = "1.8.1"
androidx-appcompat = "1.6.1"
androidx-benchmark = "1.1.0"
androidx-benchmark-junit4 = "1.1.1"
androidx-benchmark = "1.2.0"
androidx-benchmark-junit4 = "1.2.1"
androidx-compose-bom = "2023.10.01"
androidx-constraintlayout = "1.0.1"
androidx-corektx = "1.13.0-alpha01"
androidx-glance = "1.0.0-rc01"
androidx-glance = "1.0.0"
androidx-lifecycle-compose = "2.6.2"
androidx-lifecycle-runtime-compose = "2.6.2"
androidx-navigation = "2.7.5"
Expand All @@ -22,32 +22,32 @@ androidx-test-espresso = "3.5.1"
androidx-test-ext-junit = "1.1.5"
androidx-test-ext-truth = "1.5.0"
androidx-window = "1.3.0-alpha01"
androidxHiltNavigationCompose = "1.0.0"
androidxHiltNavigationCompose = "1.1.0"
androix-test-uiautomator = "2.2.0"
coil = "2.2.2"
coil = "2.4.0"
# @keep
compileSdk = "34"
compose-compiler = "1.4.0"
compose-compiler = "1.5.4"
coroutines = "1.7.3"
google-maps = "18.1.0"
google-maps = "18.2.0"
gradle-versions = "0.50.0"
hilt = "2.43.2"
hiltExt = "1.0.0"
hilt = "2.48.1"
hiltExt = "1.1.0"
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
jdkDesugar = "1.2.2"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.8.0"
kotlin = "1.9.20"
kotlinx_immutable = "0.3.5"
ksp = "1.8.0-1.0.9"
maps-compose = "2.5.3"
material = "1.9.0"
ksp = "1.9.20-1.0.14"
maps-compose = "3.1.1"
material = "1.10.0"
# @keep
minSdk = "21"
okhttp = "4.10.0"
okhttp = "4.11.0"
robolectric = "4.9.2"
rome = "1.18.0"
room = "2.5.1"
room = "2.6.0"
secrets = "2.0.1"
# @keep
targetSdk = "33"
Expand Down
30 changes: 15 additions & 15 deletions JetLagged/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ accompanist = "0.32.0"
androidGradlePlugin = "8.1.4"
androidx-activity-compose = "1.8.1"
androidx-appcompat = "1.6.1"
androidx-benchmark = "1.1.0"
androidx-benchmark-junit4 = "1.1.1"
androidx-benchmark = "1.2.0"
androidx-benchmark-junit4 = "1.2.1"
androidx-compose-bom = "2023.10.01"
androidx-constraintlayout = "1.0.1"
androidx-corektx = "1.13.0-alpha01"
androidx-glance = "1.0.0-rc01"
androidx-glance = "1.0.0"
androidx-lifecycle-compose = "2.6.2"
androidx-lifecycle-runtime-compose = "2.6.2"
androidx-navigation = "2.7.5"
Expand All @@ -22,32 +22,32 @@ androidx-test-espresso = "3.5.1"
androidx-test-ext-junit = "1.1.5"
androidx-test-ext-truth = "1.5.0"
androidx-window = "1.3.0-alpha01"
androidxHiltNavigationCompose = "1.0.0"
androidxHiltNavigationCompose = "1.1.0"
androix-test-uiautomator = "2.2.0"
coil = "2.2.2"
coil = "2.4.0"
# @keep
compileSdk = "34"
compose-compiler = "1.4.0"
compose-compiler = "1.5.4"
coroutines = "1.7.3"
google-maps = "18.1.0"
google-maps = "18.2.0"
gradle-versions = "0.50.0"
hilt = "2.43.2"
hiltExt = "1.0.0"
hilt = "2.48.1"
hiltExt = "1.1.0"
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
jdkDesugar = "1.2.2"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.8.0"
kotlin = "1.9.20"
kotlinx_immutable = "0.3.5"
ksp = "1.8.0-1.0.9"
maps-compose = "2.5.3"
material = "1.9.0"
ksp = "1.9.20-1.0.14"
maps-compose = "3.1.1"
material = "1.10.0"
# @keep
minSdk = "21"
okhttp = "4.10.0"
okhttp = "4.11.0"
robolectric = "4.9.2"
rome = "1.18.0"
room = "2.5.1"
room = "2.6.0"
secrets = "2.0.1"
# @keep
targetSdk = "33"
Expand Down
30 changes: 15 additions & 15 deletions JetNews/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ accompanist = "0.32.0"
androidGradlePlugin = "8.1.4"
androidx-activity-compose = "1.8.1"
androidx-appcompat = "1.6.1"
androidx-benchmark = "1.1.0"
androidx-benchmark-junit4 = "1.1.1"
androidx-benchmark = "1.2.0"
androidx-benchmark-junit4 = "1.2.1"
androidx-compose-bom = "2023.10.01"
androidx-constraintlayout = "1.0.1"
androidx-corektx = "1.13.0-alpha01"
androidx-glance = "1.0.0-rc01"
androidx-glance = "1.0.0"
androidx-lifecycle-compose = "2.6.2"
androidx-lifecycle-runtime-compose = "2.6.2"
androidx-navigation = "2.7.5"
Expand All @@ -22,32 +22,32 @@ androidx-test-espresso = "3.5.1"
androidx-test-ext-junit = "1.1.5"
androidx-test-ext-truth = "1.5.0"
androidx-window = "1.3.0-alpha01"
androidxHiltNavigationCompose = "1.0.0"
androidxHiltNavigationCompose = "1.1.0"
androix-test-uiautomator = "2.2.0"
coil = "2.2.2"
coil = "2.4.0"
# @keep
compileSdk = "34"
compose-compiler = "1.4.0"
compose-compiler = "1.5.4"
coroutines = "1.7.3"
google-maps = "18.1.0"
google-maps = "18.2.0"
gradle-versions = "0.50.0"
hilt = "2.43.2"
hiltExt = "1.0.0"
hilt = "2.48.1"
hiltExt = "1.1.0"
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
jdkDesugar = "1.2.2"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.8.0"
kotlin = "1.9.20"
kotlinx_immutable = "0.3.5"
ksp = "1.8.0-1.0.9"
maps-compose = "2.5.3"
material = "1.9.0"
ksp = "1.9.20-1.0.14"
maps-compose = "3.1.1"
material = "1.10.0"
# @keep
minSdk = "21"
okhttp = "4.10.0"
okhttp = "4.11.0"
robolectric = "4.9.2"
rome = "1.18.0"
room = "2.5.1"
room = "2.6.0"
secrets = "2.0.1"
# @keep
targetSdk = "33"
Expand Down
30 changes: 15 additions & 15 deletions Jetcaster/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ accompanist = "0.32.0"
androidGradlePlugin = "8.1.4"
androidx-activity-compose = "1.8.1"
androidx-appcompat = "1.6.1"
androidx-benchmark = "1.1.0"
androidx-benchmark-junit4 = "1.1.1"
androidx-benchmark = "1.2.0"
androidx-benchmark-junit4 = "1.2.1"
androidx-compose-bom = "2023.10.01"
androidx-constraintlayout = "1.0.1"
androidx-corektx = "1.13.0-alpha01"
androidx-glance = "1.0.0-rc01"
androidx-glance = "1.0.0"
androidx-lifecycle-compose = "2.6.2"
androidx-lifecycle-runtime-compose = "2.6.2"
androidx-navigation = "2.7.5"
Expand All @@ -22,32 +22,32 @@ androidx-test-espresso = "3.5.1"
androidx-test-ext-junit = "1.1.5"
androidx-test-ext-truth = "1.5.0"
androidx-window = "1.3.0-alpha01"
androidxHiltNavigationCompose = "1.0.0"
androidxHiltNavigationCompose = "1.1.0"
androix-test-uiautomator = "2.2.0"
coil = "2.2.2"
coil = "2.4.0"
# @keep
compileSdk = "34"
compose-compiler = "1.4.0"
compose-compiler = "1.5.4"
coroutines = "1.7.3"
google-maps = "18.1.0"
google-maps = "18.2.0"
gradle-versions = "0.50.0"
hilt = "2.43.2"
hiltExt = "1.0.0"
hilt = "2.48.1"
hiltExt = "1.1.0"
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
jdkDesugar = "1.2.2"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.8.0"
kotlin = "1.9.20"
kotlinx_immutable = "0.3.5"
ksp = "1.8.0-1.0.9"
maps-compose = "2.5.3"
material = "1.9.0"
ksp = "1.9.20-1.0.14"
maps-compose = "3.1.1"
material = "1.10.0"
# @keep
minSdk = "21"
okhttp = "4.10.0"
okhttp = "4.11.0"
robolectric = "4.9.2"
rome = "1.18.0"
room = "2.5.1"
room = "2.6.0"
secrets = "2.0.1"
# @keep
targetSdk = "33"
Expand Down
30 changes: 15 additions & 15 deletions Jetchat/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ accompanist = "0.32.0"
androidGradlePlugin = "8.1.4"
androidx-activity-compose = "1.8.1"
androidx-appcompat = "1.6.1"
androidx-benchmark = "1.1.0"
androidx-benchmark-junit4 = "1.1.1"
androidx-benchmark = "1.2.0"
androidx-benchmark-junit4 = "1.2.1"
androidx-compose-bom = "2023.10.01"
androidx-constraintlayout = "1.0.1"
androidx-corektx = "1.13.0-alpha01"
androidx-glance = "1.0.0-rc01"
androidx-glance = "1.0.0"
androidx-lifecycle-compose = "2.6.2"
androidx-lifecycle-runtime-compose = "2.6.2"
androidx-navigation = "2.7.5"
Expand All @@ -22,32 +22,32 @@ androidx-test-espresso = "3.5.1"
androidx-test-ext-junit = "1.1.5"
androidx-test-ext-truth = "1.5.0"
androidx-window = "1.3.0-alpha01"
androidxHiltNavigationCompose = "1.0.0"
androidxHiltNavigationCompose = "1.1.0"
androix-test-uiautomator = "2.2.0"
coil = "2.2.2"
coil = "2.4.0"
# @keep
compileSdk = "34"
compose-compiler = "1.4.0"
compose-compiler = "1.5.4"
coroutines = "1.7.3"
google-maps = "18.1.0"
google-maps = "18.2.0"
gradle-versions = "0.50.0"
hilt = "2.43.2"
hiltExt = "1.0.0"
hilt = "2.48.1"
hiltExt = "1.1.0"
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
jdkDesugar = "1.2.2"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.8.0"
kotlin = "1.9.20"
kotlinx_immutable = "0.3.5"
ksp = "1.8.0-1.0.9"
maps-compose = "2.5.3"
material = "1.9.0"
ksp = "1.9.20-1.0.14"
maps-compose = "3.1.1"
material = "1.10.0"
# @keep
minSdk = "21"
okhttp = "4.10.0"
okhttp = "4.11.0"
robolectric = "4.9.2"
rome = "1.18.0"
room = "2.5.1"
room = "2.6.0"
secrets = "2.0.1"
# @keep
targetSdk = "33"
Expand Down
30 changes: 15 additions & 15 deletions Jetsnack/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ accompanist = "0.32.0"
androidGradlePlugin = "8.1.4"
androidx-activity-compose = "1.8.1"
androidx-appcompat = "1.6.1"
androidx-benchmark = "1.1.0"
androidx-benchmark-junit4 = "1.1.1"
androidx-benchmark = "1.2.0"
androidx-benchmark-junit4 = "1.2.1"
androidx-compose-bom = "2023.10.01"
androidx-constraintlayout = "1.0.1"
androidx-corektx = "1.13.0-alpha01"
androidx-glance = "1.0.0-rc01"
androidx-glance = "1.0.0"
androidx-lifecycle-compose = "2.6.2"
androidx-lifecycle-runtime-compose = "2.6.2"
androidx-navigation = "2.7.5"
Expand All @@ -22,32 +22,32 @@ androidx-test-espresso = "3.5.1"
androidx-test-ext-junit = "1.1.5"
androidx-test-ext-truth = "1.5.0"
androidx-window = "1.3.0-alpha01"
androidxHiltNavigationCompose = "1.0.0"
androidxHiltNavigationCompose = "1.1.0"
androix-test-uiautomator = "2.2.0"
coil = "2.2.2"
coil = "2.4.0"
# @keep
compileSdk = "34"
compose-compiler = "1.4.0"
compose-compiler = "1.5.4"
coroutines = "1.7.3"
google-maps = "18.1.0"
google-maps = "18.2.0"
gradle-versions = "0.50.0"
hilt = "2.43.2"
hiltExt = "1.0.0"
hilt = "2.48.1"
hiltExt = "1.1.0"
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
jdkDesugar = "1.2.2"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.8.0"
kotlin = "1.9.20"
kotlinx_immutable = "0.3.5"
ksp = "1.8.0-1.0.9"
maps-compose = "2.5.3"
material = "1.9.0"
ksp = "1.9.20-1.0.14"
maps-compose = "3.1.1"
material = "1.10.0"
# @keep
minSdk = "21"
okhttp = "4.10.0"
okhttp = "4.11.0"
robolectric = "4.9.2"
rome = "1.18.0"
room = "2.5.1"
room = "2.6.0"
secrets = "2.0.1"
# @keep
targetSdk = "33"
Expand Down
Loading

0 comments on commit e52dfd0

Please sign in to comment.