Skip to content

Commit c739be3

Browse files
JolandaVerhoefJolandaVerhoef
authored
Update main | Compose 1.2.1 | Compiler 1.3.0 | Kotlin 1.7.10 (#924)
* Update versions * Address review comments
1 parent 0589ee1 commit c739be3

File tree

17 files changed

+231
-93
lines changed

17 files changed

+231
-93
lines changed

‎Crane/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ android {
104104

105105
dependencies {
106106
implementation Libs.Kotlin.stdlib
107-
implementation Libs.Kotlin.Coroutines.android
107+
implementation Libs.Coroutines.android
108108
implementation Libs.GoogleMaps.maps
109109
implementation Libs.GoogleMaps.composeMaps
110110
constraints {
@@ -144,7 +144,7 @@ dependencies {
144144
androidTestImplementation Libs.AndroidX.Test.espressoCore
145145
androidTestImplementation Libs.AndroidX.Test.rules
146146
androidTestImplementation Libs.AndroidX.Test.Ext.junit
147-
androidTestImplementation Libs.Kotlin.Coroutines.test
147+
androidTestImplementation Libs.Coroutines.test
148148
androidTestImplementation Libs.AndroidX.Compose.uiTest
149149
androidTestImplementation Libs.Hilt.android
150150
androidTestImplementation Libs.Hilt.testing

‎Crane/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ subprojects {
4242
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4343
maven { url Urls.composeSnapshotRepo }
4444
}
45+
if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
46+
maven { url Urls.composeCompilerSnapshotRepo }
47+
}
4548
}
4649

4750
apply plugin: 'com.diffplug.spotless'

‎Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
2525
const val secretsGradlePlugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
2626
const val ktLint = "com.pinterest:ktlint:${Versions.ktlint}"
2727

@@ -37,16 +37,16 @@ object Libs {
3737
}
3838

3939
object Kotlin {
40-
private const val version = "1.7.0"
40+
private const val version = "1.7.10"
4141
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
4242
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
4343
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
44+
}
4445

45-
object Coroutines {
46-
private const val version = "1.6.0"
47-
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
48-
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
49-
}
46+
object Coroutines {
47+
private const val version = "1.6.0"
48+
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
49+
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
5050
}
5151

5252
object AndroidX {
@@ -57,9 +57,10 @@ object Libs {
5757
const val appcompat = "androidx.appcompat:appcompat:1.4.1"
5858

5959
object Compose {
60-
const val compilerVersion = "1.2.0"
60+
const val compilerSnapshot = ""
61+
const val compilerVersion = "1.3.0"
6162
const val snapshot = ""
62-
const val version = "1.2.0"
63+
const val version = "1.2.1"
6364

6465
const val runtime = "androidx.compose.runtime:runtime:$version"
6566
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -125,4 +126,6 @@ object Urls {
125126
const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
126127
const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
127128
"${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
129+
const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
130+
"${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
128131
}

‎JetNews/build.gradle‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.7.0'
19-
ext.compose_compiler_version = '1.2.0'
20-
ext.compose_version = '1.2.0'
18+
ext.kotlin_version = '1.7.10'
19+
ext.compose_compiler_version = '1.3.0'
20+
ext.compose_compiler_snapshot_version = ''
21+
ext.compose_version = '1.2.1'
2122
ext.compose_snapshot_version = ''
2223
ext.coroutines_version = '1.6.0'
2324
ext.accompanist_version = '0.25.1'
@@ -47,6 +48,10 @@ subprojects {
4748
maven { url "https://androidx.dev/snapshots/builds/" +
4849
"${compose_snapshot_version}/artifacts/repository/" }
4950
}
51+
if (!compose_compiler_snapshot_version.isEmpty()) {
52+
maven { url "https://androidx.dev/snapshots/builds/" +
53+
"${compose_compiler_snapshot_version}/artifacts/repository/" }
54+
}
5055
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
5156
}
5257

‎Jetcaster/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616

1717
import com.example.jetcaster.buildsrc.Libs
18+
import com.example.jetcaster.buildsrc.Urls
1819
import com.example.jetcaster.buildsrc.Versions
1920

2021
buildscript {
@@ -42,6 +43,9 @@ subprojects {
4243
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4344
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
4445
}
46+
if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
47+
maven { url Urls.composeCompilerSnapshotRepo }
48+
}
4549
if (Libs.Accompanist.version.endsWith('SNAPSHOT')) {
4650
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
4751
}

‎Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
2626

2727
object Accompanist {
28-
const val version = "0.25.0"
28+
const val version = "0.25.1"
2929
const val pager = "com.google.accompanist:accompanist-pager:$version"
3030
}
3131

3232
object Kotlin {
33-
private const val version = "1.7.0"
33+
private const val version = "1.7.10"
3434
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3535
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3636
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -69,13 +69,10 @@ object Libs {
6969
}
7070

7171
object Compose {
72-
const val compilerVersion = "1.2.0"
72+
const val compilerSnapshot = ""
73+
const val compilerVersion = "1.3.0"
7374
const val snapshot = ""
74-
const val version = "1.2.0"
75-
76-
@get:JvmStatic
77-
val snapshotUrl: String
78-
get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
75+
const val version = "1.2.1"
7976

8077
const val runtime = "androidx.compose.runtime:runtime:$version"
8178
const val foundation = "androidx.compose.foundation:foundation:${version}"
@@ -135,3 +132,11 @@ object Libs {
135132
const val coilCompose = "io.coil-kt:coil-compose:2.0.0"
136133
}
137134
}
135+
136+
object Urls {
137+
const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
138+
const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
139+
"${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
140+
const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
141+
"${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
142+
}

‎Jetchat/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ subprojects {
4646
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4747
maven { url Urls.composeSnapshotRepo }
4848
}
49+
if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
50+
maven { url Urls.composeCompilerSnapshotRepo }
51+
}
4952
}
5053

5154
apply plugin: 'com.diffplug.spotless'

‎Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
2626

2727
const val junit = "junit:junit:4.13"
2828

2929
const val material3 = "com.google.android.material:material:1.6.0-alpha03"
3030

3131
object Kotlin {
32-
private const val version = "1.7.0"
32+
private const val version = "1.7.10"
3333
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3434
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3535
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -51,9 +51,10 @@ object Libs {
5151
}
5252

5353
object Compose {
54-
const val compilerVersion = "1.2.0"
54+
const val compilerSnapshot = ""
55+
const val compilerVersion = "1.3.0"
5556
const val snapshot = ""
56-
const val version = "1.2.0"
57+
const val version = "1.2.1"
5758

5859
const val foundation = "androidx.compose.foundation:foundation:$version"
5960
const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -110,6 +111,8 @@ object Libs {
110111
object Urls {
111112
const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
112113
"${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
114+
const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
115+
"${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
113116
const val composeMaterial3SnapshotRepo = "https://androidx.dev/snapshots/builds/" +
114117
"${Libs.AndroidX.Compose.Material3.snapshot}/artifacts/repository/"
115118
const val accompanistSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots"

‎Jetsnack/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616

1717
import com.example.jetsnack.buildsrc.Libs
18+
import com.example.jetsnack.buildsrc.Urls
1819
import com.example.jetsnack.buildsrc.Versions
1920

2021
buildscript {
@@ -42,6 +43,9 @@ subprojects {
4243
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4344
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
4445
}
46+
if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
47+
maven { url Urls.composeCompilerSnapshotRepo }
48+
}
4549
if (Libs.Accompanist.version.endsWith("SNAPSHOT")) {
4650
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
4751
}

‎Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
2525

2626
object Accompanist {
27-
const val version = "0.25.0"
27+
const val version = "0.25.1"
2828
const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
2929
const val flowlayouts = "com.google.accompanist:accompanist-flowlayout:$version"
3030
}
3131

3232
object Kotlin {
33-
private const val version = "1.7.0"
33+
private const val version = "1.7.10"
3434
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3535
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3636
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -47,9 +47,10 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.7.0"
4848

4949
object Compose {
50-
const val compilerVersion = "1.2.0"
50+
const val compilerSnapshot = ""
51+
const val compilerVersion = "1.3.0"
5152
const val snapshot = ""
52-
const val version = "1.2.0"
53+
const val version = "1.2.1"
5354

5455
const val foundation = "androidx.compose.foundation:foundation:${version}"
5556
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
@@ -105,3 +106,11 @@ object Libs {
105106
const val coilCompose = "io.coil-kt:coil-compose:2.0.0"
106107
}
107108
}
109+
110+
object Urls {
111+
const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
112+
const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
113+
"${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
114+
const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
115+
"${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
116+
}

0 commit comments

Comments
 (0)