Skip to content

Commit 443ca9c

Browse files
author
Chris
committedAug 21, 2020
Move all apps to Compose SNAPSHOT 6765009
Change-Id: Id850a7ea9b22c0ae01c3b6377fc2f7e653bf46d7
1 parent 6c46b3c commit 443ca9c

File tree

18 files changed

+85
-38
lines changed

18 files changed

+85
-38
lines changed
 

‎Crane/app/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ plugins {
2323

2424
// Reads the Google maps key that is used in the AndroidManifest
2525
Properties properties = new Properties()
26-
properties.load(project.rootProject.file("local.properties").newDataInputStream())
26+
if (rootProject.file("local.properties").exists()) {
27+
properties.load(rootProject.file("local.properties").newDataInputStream())
28+
}
2729

2830
android {
2931
compileSdkVersion 30

‎Crane/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ subprojects {
3939
google()
4040
jcenter()
4141
mavenCentral()
42-
if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
42+
43+
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4344
maven { url Urls.composeSnapshotRepo }
4445
maven { url Urls.mavenCentralSnapshotRepo }
4546
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object Libs {
2626
const val googleMaps = "com.google.android.libraries.maps:maps:3.1.0-beta"
2727

2828
object Accompanist {
29-
private const val version = "0.1.9"
29+
private const val version = "0.1.10.ui-${AndroidX.Compose.snapshot}-SNAPSHOT"
3030
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3131
}
3232

@@ -41,8 +41,8 @@ object Libs {
4141
const val appcompat = "androidx.appcompat:appcompat:1.3.0-alpha01"
4242

4343
object Compose {
44-
const val snapshot = ""
45-
const val version = "0.1.0-dev17"
44+
const val snapshot = "6765009"
45+
const val version = "1.0.0-SNAPSHOT"
4646

4747
const val runtime = "androidx.compose.runtime:runtime:$version"
4848
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"

‎JetNews/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616

1717
buildscript {
1818
ext.kotlin_version = '1.4.0'
19-
ext.compose_version = '0.1.0-dev17'
19+
ext.compose_version = '1.0.0-SNAPSHOT'
2020

2121
repositories {
2222
google()
2323
jcenter()
2424
}
25+
2526
dependencies {
2627
classpath 'com.android.tools.build:gradle:4.2.0-alpha07'
2728
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -36,6 +37,10 @@ subprojects {
3637
repositories {
3738
google()
3839
jcenter()
40+
41+
maven {
42+
url "https://androidx.dev/snapshots/builds/6765009/artifacts/ui/repository/"
43+
}
3944
}
4045

4146
apply plugin: 'com.diffplug.spotless'

‎Jetcaster/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ subprojects {
4040
mavenCentral()
4141
jcenter()
4242

43-
if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
43+
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4444
maven {
4545
url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
4646
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ object Libs {
2929
const val material = "com.google.android.material:material:1.1.0"
3030

3131
object Accompanist {
32-
private const val version = "0.1.9"
33-
const val mdcTheme = "dev.chrisbanes.accompanist:accompanist-mdc-theme:$version"
32+
private const val version = "0.1.10.ui-${AndroidX.Compose.snapshot}-SNAPSHOT"
3433
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3534
}
3635

@@ -60,8 +59,8 @@ object Libs {
6059
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
6160

6261
object Compose {
63-
const val snapshot = ""
64-
const val version = "0.1.0-dev17"
62+
const val snapshot = "6765009"
63+
const val version = "1.0.0-SNAPSHOT"
6564

6665
const val runtime = "androidx.compose.runtime:runtime:$version"
6766
const val foundation = "androidx.compose.foundation:foundation:${version}"

‎Jetchat/app/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ import com.example.compose.jetchat.buildsrc.Libs
1919
plugins {
2020
id 'com.android.application'
2121
id 'kotlin-android'
22-
id 'kotlin-kapt'
23-
}
24-
25-
kapt {
26-
correctErrorTypes = true
27-
useBuildCache = true
2822
}
2923

3024
android {

‎Jetchat/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ subprojects {
4040
mavenCentral()
4141
jcenter()
4242

43-
if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
43+
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4444
maven {
4545
url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
4646
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4848

4949
object Compose {
50-
const val snapshot = ""
51-
const val version = "0.1.0-dev17"
50+
const val snapshot = "6765009"
51+
const val version = "1.0.0-SNAPSHOT"
5252

5353
const val core = "androidx.compose.ui:ui:$version"
5454
const val foundation = "androidx.compose.foundation:foundation:$version"

‎Jetsnack/build.gradle

+9-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,18 @@ plugins {
3434

3535
subprojects {
3636
repositories {
37-
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository" }
3837
google()
39-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4038
jcenter()
39+
40+
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
41+
maven {
42+
url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
43+
}
44+
}
45+
46+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4147
}
48+
4249
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
4350
kotlinOptions {
4451
jvmTarget = '1.8'

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object Libs {
2525
const val junit = "junit:junit:4.13"
2626

2727
object Accompanist {
28-
private const val version = "0.1.9"
28+
private const val version = "0.1.10.ui-${AndroidX.Compose.snapshot}-SNAPSHOT"
2929
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3030
}
3131

@@ -48,8 +48,8 @@ object Libs {
4848
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4949

5050
object Compose {
51-
const val snapshot = ""
52-
const val version = "0.1.0-dev17"
51+
const val snapshot = "6765009"
52+
const val version = "1.0.0-SNAPSHOT"
5353

5454
const val runtime = "androidx.compose.runtime:runtime:$version"
5555
const val foundation = "androidx.compose.foundation:foundation:${version}"

‎Jetsurvey/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ subprojects {
3838
mavenCentral()
3939
jcenter()
4040

41-
if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
41+
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4242
maven {
4343
url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
4444
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ object Libs {
4040
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4141

4242
object Compose {
43-
const val snapshot = ""
44-
const val version = "0.1.0-dev17"
43+
const val snapshot = "6765009"
44+
const val version = "1.0.0-SNAPSHOT"
4545

4646
const val core = "androidx.compose.ui:ui:$version"
4747
const val foundation = "androidx.compose.foundation:foundation:$version"

‎Owl/build.gradle

+9-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,18 @@ plugins {
3434

3535
subprojects {
3636
repositories {
37-
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository" }
3837
google()
39-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4038
jcenter()
39+
40+
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
41+
maven {
42+
url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
43+
}
44+
}
45+
46+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4147
}
48+
4249
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
4350
kotlinOptions {
4451
jvmTarget = '1.8'

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object Libs {
2525
const val junit = "junit:junit:4.13"
2626

2727
object Accompanist {
28-
private const val version = "0.1.9"
28+
private const val version = "0.1.10.ui-${AndroidX.Compose.snapshot}-SNAPSHOT"
2929
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3030
}
3131

@@ -48,8 +48,8 @@ object Libs {
4848
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4949

5050
object Compose {
51-
const val snapshot = ""
52-
const val version = "0.1.0-dev17"
51+
const val snapshot = "6765009"
52+
const val version = "1.0.0-SNAPSHOT"
5353

5454
const val runtime = "androidx.compose.runtime:runtime:$version"
5555
const val foundation = "androidx.compose.foundation:foundation:$version"

‎Rally/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ buildscript {
2121
repositories {
2222
google()
2323
jcenter()
24-
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev/' }
2524
}
2625

2726
dependencies {
@@ -40,12 +39,11 @@ subprojects {
4039
mavenCentral()
4140
jcenter()
4241

43-
if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
42+
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4443
maven {
4544
url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
4645
}
4746
}
48-
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev/' }
4947

5048
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
5149
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4848

4949
object Compose {
50-
const val snapshot = ""
51-
const val version = "0.1.0-dev17"
50+
const val snapshot = "6765009"
51+
const val version = "1.0.0-SNAPSHOT"
5252

5353
const val core = "androidx.compose.ui:ui:$version"
5454
const val foundation = "androidx.compose.foundation:foundation:$version"

‎scripts/gradlew_recursive.sh

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
3+
# Copyright (C) 2020 The Android Open Source Project
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
########################################################################
18+
#
19+
# Allows running of ./gradlew commands across all projects in
20+
# folders of the current directory.
21+
#
22+
# Example: To run build over all projects run:
23+
# ./scripts/gradlew_recursive.sh build
24+
#
25+
########################################################################
26+
27+
set -xe
28+
29+
# Crawl all gradlew files which indicate an Android project
30+
# You may edit this if your repo has a different project structure
31+
for GRADLEW in `find . -name "gradlew"` ; do
32+
SAMPLE=$(dirname "${GRADLEW}")
33+
bash "$GRADLEW" -p "$SAMPLE" --stacktrace $@
34+
done

0 commit comments

Comments
 (0)
Please sign in to comment.