Skip to content

Commit 99210f2

Browse files
JoseAlcerrecaJoseAlcerreca
authoredOct 1, 2020
Alpha04 release (android#207)
* WIP: Bumps Compose version from snapshot to alpha04 Change-Id: I3d70b9749963039799efe939ce825c92831c218c * Bump all AGPs to alpha13 Change-Id: Ifc10d2808bc6bc0d2da848843451b7d82c599aa4 * Replaces .all with .configureEach Change-Id: If3518252964687e19480d3589761bca41d09f242 * trigger GitHub actions Change-Id: Id082d72e4d1c1829cca269423869b16b1544b570 * Jetcaster build.gradle fix Change-Id: I845726c12d0a676c35854b1a1bb3019bea5bc2b2 * [Crane, JetNews] Downgrade to AGP12 Change-Id: I54f0b6fb17daabc2a0fe8072f6b7314ee7aa966c
1 parent 13f0b5f commit 99210f2

File tree

20 files changed

+35
-203
lines changed

20 files changed

+35
-203
lines changed
 

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

+1-1
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:4.2.0-alpha11"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
2525
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
2626
const val googleMaps = "com.google.android.libraries.maps:maps:3.1.0-beta"
2727

Diff for: ‎JetNews/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ buildscript {
2424
}
2525

2626
dependencies {
27-
classpath 'com.android.tools.build:gradle:4.2.0-alpha11'
27+
classpath 'com.android.tools.build:gradle:4.2.0-alpha12'
2828
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2929
}
3030
}

Diff for: ‎Jetcaster/app/build.gradle

+1-9
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,7 @@ android {
8484
}
8585

8686
buildFeatures {
87-
// We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
88-
// Compose compiler artifact has changed artifact group/name.
89-
// Instead we add the compiler manually below in the dependencies {}. Also see
90-
// the root build.gradle for info on how to apply the plugin.
91-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
92-
93-
// compose true
87+
compose true
9488
}
9589

9690
composeOptions {
@@ -108,8 +102,6 @@ dependencies {
108102

109103
implementation Libs.AndroidX.Lifecycle.viewmodel
110104

111-
kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
112-
113105
implementation Libs.AndroidX.Compose.foundation
114106
implementation Libs.AndroidX.Compose.material
115107
implementation Libs.AndroidX.Compose.materialIconsExtended

Diff for: ‎Jetcaster/build.gradle

+1-18
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,7 @@ subprojects {
6464
}
6565
}
6666

67-
// Create a configuration which allows us to intercept the JARs, and add them to
68-
// Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
69-
// built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
70-
// TODO: Remove this once AGP uses the new Compose Compiler artifact name
71-
def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
72-
73-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
67+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
7468
kotlinOptions {
7569
// Treat all Kotlin warnings as errors
7670
allWarningsAsErrors = true
@@ -87,16 +81,5 @@ subprojects {
8781
// Set JVM target to 1.8
8882
jvmTarget = "1.8"
8983
}
90-
91-
compile.dependsOn(compilerPluginConfig)
92-
compile.doFirst {
93-
if (!compilerPluginConfig.isEmpty()) {
94-
// Add the compiler plugin JARs using the -Xplugin flag
95-
compile.kotlinOptions.freeCompilerArgs +=
96-
"-Xplugin=${compilerPluginConfig.files.first()}"
97-
// Need to turn on the IR compiler too
98-
compile.kotlinOptions.useIR = true
99-
}
100-
}
10184
}
10285
}

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

+4-6
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:4.2.0-alpha12"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

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

2929
const val material = "com.google.android.material:material:1.1.0"
3030

3131
object Accompanist {
32-
private const val version = "0.2.3.compose-6860046-SNAPSHOT"
32+
private const val version = "0.3.0"
3333
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3434
}
3535

@@ -61,10 +61,8 @@ object Libs {
6161
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
6262

6363
object Compose {
64-
const val snapshot = "6860046"
65-
const val version = "1.0.0-SNAPSHOT"
66-
67-
const val compiler = "androidx.compose.compiler:compiler:$version"
64+
const val snapshot = ""
65+
const val version = "1.0.0-alpha04"
6866

6967
const val runtime = "androidx.compose.runtime:runtime:$version"
7068
const val foundation = "androidx.compose.foundation:foundation:${version}"

Diff for: ‎Jetchat/app/build.gradle

+1-11
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,7 @@ android {
6666
}
6767

6868
buildFeatures {
69-
// We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
70-
// Compose compiler artifact has changed artifact group/name.
71-
// Instead we add the compiler manually below in the dependencies {}. Also see
72-
// the root build.gradle for info on how to apply the plugin.
73-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
74-
75-
// compose true
69+
compose true
7670
}
7771

7872
composeOptions {
@@ -86,10 +80,6 @@ dependencies {
8680
implementation Libs.Kotlin.stdlib
8781
implementation Libs.Coroutines.android
8882

89-
// Temporary workaround (see above)
90-
// TODO: remove Compose.compiler once we upgrade to an AGP version which uses the new artifact details
91-
kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
92-
9383
implementation Libs.AndroidX.coreKtx
9484
implementation Libs.AndroidX.appcompat
9585
implementation Libs.AndroidX.Navigation.fragment

Diff for: ‎Jetchat/build.gradle

+1-18
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,8 @@ subprojects {
6060
licenseHeaderFile rootProject.file('spotless/copyright.kt')
6161
}
6262
}
63-
// Create a configuration which allows us to intercept the JARs, and add them to
64-
// Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
65-
// built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
66-
// TODO: Remove this once AGP uses the new Compose Compiler artifact name
67-
def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
68-
69-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
70-
71-
compile.dependsOn(compilerPluginConfig)
72-
compile.doFirst {
73-
if (!compilerPluginConfig.isEmpty()) {
74-
// Add the compiler plugin JARs using the -Xplugin flag
75-
compile.kotlinOptions.freeCompilerArgs +=
76-
"-Xplugin=${compilerPluginConfig.files.first()}"
77-
// Need to turn on the IR compiler too
78-
compile.kotlinOptions.useIR = true
79-
}
80-
}
8163

64+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
8265
kotlinOptions {
8366
// Treat all Kotlin warnings as errors
8467
allWarningsAsErrors = true

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

+3-4
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:4.2.0-alpha12"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

2727
const val junit = "junit:junit:4.13"
@@ -47,10 +47,9 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4848

4949
object Compose {
50-
const val snapshot = "6860046"
51-
const val version = "1.0.0-SNAPSHOT"
50+
const val snapshot = ""
51+
const val version = "1.0.0-alpha04"
5252

53-
const val compiler = "androidx.compose.compiler:compiler:$version"
5453
const val core = "androidx.compose.ui:ui:$version"
5554
const val foundation = "androidx.compose.foundation:foundation:$version"
5655
const val layout = "androidx.compose.foundation:foundation-layout:$version"

Diff for: ‎Jetsnack/app/build.gradle

+1-10
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,7 @@ android {
6161
}
6262

6363
buildFeatures {
64-
// We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
65-
// Compose compiler artifact has changed artifact group/name.
66-
// Instead we add the compiler manually below in the dependencies {}. Also see
67-
// the root build.gradle for info on how to apply the plugin.
68-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
69-
// compose true
70-
64+
compose true
7165
// Disable unused AGP features
7266
buildConfig false
7367
aidl false
@@ -83,9 +77,6 @@ android {
8377
}
8478

8579
dependencies {
86-
// Temporary workaround (see above)
87-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
88-
kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
8980

9081
implementation Libs.Kotlin.stdlib
9182

Diff for: ‎Jetsnack/build.gradle

+1-18
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,14 @@ subprojects {
4949
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
5050
}
5151

52-
// Create a configuration which allows us to intercept the JARs, and add them to
53-
// Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
54-
// built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
55-
// TODO: Remove this once AGP uses the new Compose Compiler artifact name
56-
def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
57-
58-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
52+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
5953
kotlinOptions {
6054
jvmTarget = '1.8'
6155
allWarningsAsErrors = true
6256
freeCompilerArgs += '-Xallow-jvm-ir-dependencies'
6357
// Opt-in to experimental compose APIs
6458
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
6559
}
66-
67-
compile.dependsOn(compilerPluginConfig)
68-
compile.doFirst {
69-
if (!compilerPluginConfig.isEmpty()) {
70-
// Add the compiler plugin JARs using the -Xplugin flag
71-
compile.kotlinOptions.freeCompilerArgs +=
72-
"-Xplugin=${compilerPluginConfig.files.first()}"
73-
// Need to turn on the IR compiler too
74-
compile.kotlinOptions.useIR = true
75-
}
76-
}
7760
}
7861
apply plugin: 'com.diffplug.spotless'
7962
spotless {

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
2525
const val junit = "junit:junit:4.13"
2626

2727
object Accompanist {
28-
private const val version = "0.2.3.compose-6860046-SNAPSHOT"
28+
private const val version = "0.3.0"
2929
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3030
}
3131

@@ -47,10 +47,9 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
4848

4949
object Compose {
50-
const val snapshot = "6860046"
51-
const val version = "1.0.0-SNAPSHOT"
50+
const val snapshot = ""
51+
const val version = "1.0.0-alpha04"
5252

53-
const val compiler = "androidx.compose.compiler:compiler:$version"
5453
const val runtime = "androidx.compose.runtime:runtime:$version"
5554
const val foundation = "androidx.compose.foundation:foundation:${version}"
5655
const val layout = "androidx.compose.foundation:foundation-layout:${version}"

Diff for: ‎Jetsurvey/app/build.gradle

+1-11
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,7 @@ android {
6464
}
6565

6666
buildFeatures {
67-
// We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
68-
// Compose compiler artifact has changed artifact group/name.
69-
// Instead we add the compiler manually below in the dependencies {}. Also see
70-
// the root build.gradle for info on how to apply the plugin.
71-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
72-
73-
// compose true
67+
compose true
7468
}
7569

7670
composeOptions {
@@ -94,10 +88,6 @@ dependencies {
9488
implementation Libs.AndroidX.Material.material
9589
implementation Libs.material
9690

97-
// Temporary workaround (see above)
98-
// TODO: remove Compose.compiler once we upgrade to an AGP version which uses the new artifact details
99-
kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
100-
10191
implementation Libs.AndroidX.Compose.layout
10292
implementation Libs.AndroidX.Compose.material
10393
implementation Libs.AndroidX.Compose.materialIconsExtended

Diff for: ‎Jetsurvey/build.gradle

+1-19
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,7 @@ subprojects {
5757
}
5858
}
5959

60-
// Create a configuration which allows us to intercept the JARs, and add them to
61-
// Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
62-
// built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
63-
// TODO: Remove this once AGP uses the new Compose Compiler artifact name
64-
def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
65-
66-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
67-
68-
compile.dependsOn(compilerPluginConfig)
69-
compile.doFirst {
70-
if (!compilerPluginConfig.isEmpty()) {
71-
// Add the compiler plugin JARs using the -Xplugin flag
72-
compile.kotlinOptions.freeCompilerArgs +=
73-
"-Xplugin=${compilerPluginConfig.files.first()}"
74-
// Need to turn on the IR compiler too
75-
compile.kotlinOptions.useIR = true
76-
}
77-
}
78-
60+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
7961
kotlinOptions {
8062
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
8163
freeCompilerArgs += '-Xallow-jvm-ir-dependencies'

Diff for: ‎Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt

+3-4
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:4.2.0-alpha12"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

2727
const val junit = "junit:junit:4.13"
@@ -40,10 +40,9 @@ object Libs {
4040
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4141

4242
object Compose {
43-
const val snapshot = "6860046"
44-
const val version = "1.0.0-SNAPSHOT"
43+
const val snapshot = ""
44+
const val version = "1.0.0-alpha04"
4545

46-
const val compiler = "androidx.compose.compiler:compiler:$version"
4746
const val core = "androidx.compose.ui:ui:$version"
4847
const val foundation = "androidx.compose.foundation:foundation:$version"
4948
const val layout = "androidx.compose.foundation:foundation-layout:$version"

Diff for: ‎Owl/app/build.gradle

+1-11
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,7 @@ android {
6161
}
6262

6363
buildFeatures {
64-
// We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
65-
// Compose compiler artifact has changed artifact group/name.
66-
// Instead we add the compiler manually below in the dependencies {}. Also see
67-
// the root build.gradle for info on how to apply the plugin.
68-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
69-
70-
// compose true
64+
compose true
7165
// Disable unused AGP features
7266
buildConfig false
7367
aidl false
@@ -83,10 +77,6 @@ android {
8377
}
8478

8579
dependencies {
86-
// Temporary workaround (see above)
87-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
88-
kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
89-
9080
implementation Libs.Kotlin.stdlib
9181

9282
implementation Libs.AndroidX.coreKtx

Diff for: ‎Owl/build.gradle

+1-19
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,13 @@ subprojects {
4646
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4747
}
4848

49-
// Create a configuration which allows us to intercept the JARs, and add them to
50-
// Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
51-
// built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
52-
// TODO: Remove this once AGP uses the new Compose Compiler artifact name
53-
def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
54-
55-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
49+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
5650
kotlinOptions {
5751
jvmTarget = '1.8'
5852
allWarningsAsErrors = true
5953
// Opt-in to experimental compose APIs
6054
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
6155
freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
62-
freeCompilerArgs += "-Xjvm-default=enable"
63-
}
64-
65-
compile.dependsOn(compilerPluginConfig)
66-
compile.doFirst {
67-
if (!compilerPluginConfig.isEmpty()) {
68-
// Add the compiler plugin JARs using the -Xplugin flag
69-
compile.kotlinOptions.freeCompilerArgs +=
70-
"-Xplugin=${compilerPluginConfig.files.first()}"
71-
// Need to turn on the IR compiler too
72-
compile.kotlinOptions.useIR = true
73-
}
7456
}
7557
}
7658

Diff for: ‎Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
2525
const val junit = "junit:junit:4.13"
2626

2727
object Accompanist {
28-
private const val version = "0.2.3.compose-6860046-SNAPSHOT"
28+
private const val version = "0.3.0"
2929
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3030
}
3131

@@ -47,10 +47,9 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
4848

4949
object Compose {
50-
const val snapshot = "6860046"
51-
const val version = "1.0.0-SNAPSHOT"
50+
const val snapshot = ""
51+
const val version = "1.0.0-alpha04"
5252

53-
const val compiler = "androidx.compose.compiler:compiler:$version"
5453
const val runtime = "androidx.compose.runtime:runtime:$version"
5554
const val foundation = "androidx.compose.foundation:foundation:$version"
5655
const val layout = "androidx.compose.foundation:foundation-layout:$version"

Diff for: ‎Rally/app/build.gradle

+1-11
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,7 @@ android {
6666
}
6767

6868
buildFeatures {
69-
// We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
70-
// Compose compiler artifact has changed artifact group/name.
71-
// Instead we add the compiler manually below in the dependencies {}. Also see
72-
// the root build.gradle for info on how to apply the plugin.
73-
// TODO: remove this once we upgrade to an AGP version which uses the new artifact details
74-
75-
// compose true
69+
compose true
7670
}
7771

7872
composeOptions {
@@ -86,10 +80,6 @@ dependencies {
8680
implementation Libs.Kotlin.stdlib
8781
implementation Libs.Coroutines.android
8882

89-
// Temporary workaround (see above)
90-
// TODO: remove Compose.compiler once we upgrade to an AGP version which uses the new artifact details
91-
kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
92-
9383
implementation Libs.AndroidX.coreKtx
9484
implementation Libs.AndroidX.appcompat
9585
implementation Libs.AndroidX.Navigation.fragment

Diff for: ‎Rally/build.gradle

+1-18
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,7 @@ subprojects {
6060
}
6161
}
6262

63-
// Create a configuration which allows us to intercept the JARs, and add them to
64-
// Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
65-
// built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
66-
// TODO: Remove this once AGP uses the new Compose Compiler artifact name
67-
def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
68-
69-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
70-
71-
compile.dependsOn(compilerPluginConfig)
72-
compile.doFirst {
73-
if (!compilerPluginConfig.isEmpty()) {
74-
// Add the compiler plugin JARs using the -Xplugin flag
75-
compile.kotlinOptions.freeCompilerArgs +=
76-
"-Xplugin=${compilerPluginConfig.files.first()}"
77-
// Need to turn on the IR compiler too
78-
compile.kotlinOptions.useIR = true
79-
}
80-
}
63+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
8164
kotlinOptions {
8265
// Treat all Kotlin warnings as errors
8366
allWarningsAsErrors = true

Diff for: ‎Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt

+3-4
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:4.2.0-alpha12"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

2727
const val junit = "junit:junit:4.13"
@@ -47,10 +47,9 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
4848

4949
object Compose {
50-
const val snapshot = "6860046"
51-
const val version = "1.0.0-SNAPSHOT"
50+
const val snapshot = ""
51+
const val version = "1.0.0-alpha04"
5252

53-
const val compiler = "androidx.compose.compiler:compiler:$version"
5453
const val core = "androidx.compose.ui:ui:$version"
5554
const val foundation = "androidx.compose.foundation:foundation:$version"
5655
const val layout = "androidx.compose.foundation:foundation-layout:$version"

0 commit comments

Comments
 (0)
Please sign in to comment.