Skip to content

Commit 7768a4f

Browse files
simona-anomissimona-anomis
authored
[All] Update to Compose 1.2.0-alpha08 (#782)
* [All] Update to Compose 1.2.0-alpha08 * Replace deprecated -Xopt-in with -opt-in
1 parent 2a28961 commit 7768a4f

15 files changed

Lines changed: 59 additions & 57 deletions

File tree

‎Crane/app/src/main/java/androidx/compose/samples/crane/home/SearchUserInput.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import androidx.compose.samples.crane.base.CraneUserInput
3535
import androidx.compose.samples.crane.home.PeopleUserInputAnimationState.Invalid
3636
import androidx.compose.samples.crane.home.PeopleUserInputAnimationState.Valid
3737
import androidx.compose.samples.crane.ui.CraneTheme
38+
import androidx.compose.ui.ExperimentalComposeUiApi
3839
import androidx.compose.ui.graphics.Color
3940
import androidx.compose.ui.res.pluralStringResource
4041
import androidx.compose.ui.res.stringResource
@@ -63,6 +64,7 @@ class PeopleUserInputState {
6364
}
6465
}
6566

67+
@OptIn(ExperimentalComposeUiApi::class)
6668
@Composable
6769
fun PeopleUserInput(
6870
titleSuffix: String = "",

‎Crane/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildscript {
3030
}
3131

3232
plugins {
33-
id 'com.diffplug.spotless' version '6.3.0'
33+
id 'com.diffplug.spotless' version '6.4.2'
3434
}
3535

3636
subprojects {
@@ -62,7 +62,7 @@ subprojects {
6262
jvmTarget = "1.8"
6363

6464
// Use experimental APIs
65-
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
65+
freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
6666
}
6767
}
6868
// androidx.test and hilt are forcing JUnit, 4.12. This forces them to use 4.13

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.example.crane.buildsrc
1818

1919
object Versions {
20-
const val ktLint = "0.45.1"
20+
const val ktLint = "0.45.2"
2121
}
2222

2323
object Libs {
@@ -34,7 +34,7 @@ object Libs {
3434
}
3535

3636
object Kotlin {
37-
private const val version = "1.6.10"
37+
private const val version = "1.6.20"
3838
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3939
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
4040
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -55,7 +55,7 @@ object Libs {
5555

5656
object Compose {
5757
const val snapshot = ""
58-
const val version = "1.2.0-alpha07"
58+
const val version = "1.2.0-alpha08"
5959

6060
const val runtime = "androidx.compose.runtime:runtime:$version"
6161
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"

‎JetNews/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ dependencies {
116116
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
117117
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1"
118118

119-
implementation 'androidx.navigation:navigation-compose:2.4.1'
119+
implementation 'androidx.navigation:navigation-compose:2.4.2'
120120

121121
implementation "androidx.window:window:1.0.0"
122122

@@ -139,9 +139,9 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
139139
// Treat all Kotlin warnings as errors (disabled by default)
140140
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
141141

142-
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
142+
freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
143143
// Enable experimental coroutines APIs, including Flow
144-
freeCompilerArgs += '-Xopt-in=kotlin.Experimental'
144+
freeCompilerArgs += '-opt-in=kotlin.Experimental'
145145

146146
// Set JVM target to 1.8
147147
jvmTarget = "1.8"

‎JetNews/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.6.10'
19-
ext.compose_version = '1.2.0-alpha07'
18+
ext.kotlin_version = '1.6.20'
19+
ext.compose_version = '1.2.0-alpha08'
2020
ext.compose_snapshot_version = ''
2121
ext.coroutines_version = '1.6.0'
22-
ext.accompanist_version = '0.24.6-alpha'
22+
ext.accompanist_version = '0.24.7-alpha'
2323

2424
repositories {
2525
google()
@@ -33,7 +33,7 @@ buildscript {
3333
}
3434

3535
plugins {
36-
id 'com.diffplug.spotless' version '6.3.0'
36+
id 'com.diffplug.spotless' version '6.4.2'
3737
}
3838

3939
subprojects {
@@ -54,7 +54,7 @@ subprojects {
5454
targetExclude("$buildDir/**/*.kt")
5555
targetExclude('bin/**/*.kt')
5656

57-
ktlint("0.45.1")
57+
ktlint("0.45.2")
5858
licenseHeaderFile rootProject.file('spotless/copyright.kt')
5959
}
6060
}

‎Jetcaster/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildscript {
3030
}
3131

3232
plugins {
33-
id 'com.diffplug.spotless' version '6.3.0'
33+
id 'com.diffplug.spotless' version '6.4.2'
3434
}
3535

3636
subprojects {
@@ -64,12 +64,12 @@ subprojects {
6464
// Treat all Kotlin warnings as errors (disabled by default)
6565
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
6666

67-
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
67+
freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
6868

6969
// Enable experimental coroutines APIs, including Flow
70-
freeCompilerArgs += '-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi'
71-
freeCompilerArgs += '-Xopt-in=kotlinx.coroutines.FlowPreview'
72-
freeCompilerArgs += '-Xopt-in=kotlin.Experimental'
70+
freeCompilerArgs += '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi'
71+
freeCompilerArgs += '-opt-in=kotlinx.coroutines.FlowPreview'
72+
freeCompilerArgs += '-opt-in=kotlin.Experimental'
7373

7474
// Set JVM target to 1.8
7575
jvmTarget = "1.8"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
package com.example.jetcaster.buildsrc
1818

1919
object Versions {
20-
const val ktlint = "0.45.1"
20+
const val ktlint = "0.45.2"
2121
}
2222

2323
object Libs {
2424
const val androidGradlePlugin = "com.android.tools.build:gradle:7.1.2"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
2626

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

3232
object Kotlin {
33-
private const val version = "1.6.10"
33+
private const val version = "1.6.20"
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"
@@ -70,7 +70,7 @@ object Libs {
7070

7171
object Compose {
7272
const val snapshot = ""
73-
const val version = "1.2.0-alpha07"
73+
const val version = "1.2.0-alpha08"
7474

7575
@get:JvmStatic
7676
val snapshotUrl: String
@@ -96,7 +96,7 @@ object Libs {
9696
}
9797

9898
object Navigation {
99-
const val navigation = "androidx.navigation:navigation-compose:2.4.1"
99+
const val navigation = "androidx.navigation:navigation-compose:2.4.2"
100100
}
101101

102102
object Test {

‎Jetchat/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ buildscript {
3232
}
3333

3434
plugins {
35-
id 'com.diffplug.spotless' version '6.3.0'
35+
id 'com.diffplug.spotless' version '6.4.2'
3636
}
3737

3838
subprojects {
@@ -64,12 +64,12 @@ subprojects {
6464
// Treat all Kotlin warnings as errors (disabled by default)
6565
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
6666

67-
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
67+
freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
6868

6969
// Enable experimental coroutines APIs, including Flow
70-
freeCompilerArgs += '-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi'
71-
freeCompilerArgs += '-Xopt-in=kotlinx.coroutines.FlowPreview'
72-
freeCompilerArgs += '-Xopt-in=kotlin.Experimental'
70+
freeCompilerArgs += '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi'
71+
freeCompilerArgs += '-opt-in=kotlinx.coroutines.FlowPreview'
72+
freeCompilerArgs += '-opt-in=kotlin.Experimental'
7373

7474
// Set JVM target to 1.8
7575
jvmTarget = "1.8"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.example.compose.jetchat.buildsrc
1818

1919
object Versions {
20-
const val ktlint = "0.45.1"
20+
const val ktlint = "0.45.2"
2121
}
2222

2323
object Libs {
@@ -29,7 +29,7 @@ object Libs {
2929
const val material3 = "com.google.android.material:material:1.6.0-alpha03"
3030

3131
object Kotlin {
32-
private const val version = "1.6.10"
32+
private const val version = "1.6.20"
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"
@@ -52,7 +52,7 @@ object Libs {
5252

5353
object Compose {
5454
const val snapshot = ""
55-
const val version = "1.2.0-alpha07"
55+
const val version = "1.2.0-alpha08"
5656

5757
const val foundation = "androidx.compose.foundation:foundation:$version"
5858
const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -77,7 +77,7 @@ object Libs {
7777
}
7878

7979
object Navigation {
80-
private const val version = "2.4.1"
80+
private const val version = "2.4.2"
8181
const val fragment = "androidx.navigation:navigation-fragment-ktx:$version"
8282
const val uiKtx = "androidx.navigation:navigation-ui-ktx:$version"
8383
}

‎Jetsnack/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ buildscript {
2929
}
3030

3131
plugins {
32-
id 'com.diffplug.spotless' version '6.3.0'
32+
id 'com.diffplug.spotless' version '6.4.2'
3333
id 'com.android.test' version '7.3.0-alpha07' apply false
34-
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
34+
id 'org.jetbrains.kotlin.android' version '1.6.20' apply false
3535
}
3636

3737
subprojects {
@@ -52,9 +52,9 @@ subprojects {
5252
// Treat all Kotlin warnings as errors (disabled by default)
5353
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
5454

55-
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
55+
freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
5656
// Enable experimental coroutines APIs, including Flow
57-
freeCompilerArgs += '-Xopt-in=kotlin.Experimental'
57+
freeCompilerArgs += '-opt-in=kotlin.Experimental'
5858

5959
// Set JVM target to 1.8
6060
jvmTarget = "1.8"

0 commit comments

Comments
 (0)