diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml index e7d449f0f2..283932a7b5 100644 --- a/.github/workflows/Crane.yaml +++ b/.github/workflows/Crane.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt @@ -73,10 +73,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml index 49e7d6849c..2230790c32 100644 --- a/.github/workflows/JetNews.yaml +++ b/.github/workflows/JetNews.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt @@ -73,10 +73,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/Jetcaster.yaml b/.github/workflows/Jetcaster.yaml index 3ed1bcc8b9..c064db877f 100644 --- a/.github/workflows/Jetcaster.yaml +++ b/.github/workflows/Jetcaster.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/Jetchat.yaml b/.github/workflows/Jetchat.yaml index a41800104e..133e8019d0 100644 --- a/.github/workflows/Jetchat.yaml +++ b/.github/workflows/Jetchat.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt @@ -73,10 +73,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/Jetsnack.yaml b/.github/workflows/Jetsnack.yaml index 2df091fc31..fff09985ff 100644 --- a/.github/workflows/Jetsnack.yaml +++ b/.github/workflows/Jetsnack.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/Jetsurvey.yaml b/.github/workflows/Jetsurvey.yaml index 7cc8fc7001..16405ace06 100644 --- a/.github/workflows/Jetsurvey.yaml +++ b/.github/workflows/Jetsurvey.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/Owl.yaml b/.github/workflows/Owl.yaml index 23bb761116..8adc67d5a2 100644 --- a/.github/workflows/Owl.yaml +++ b/.github/workflows/Owl.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt @@ -73,10 +73,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/Rally.yaml b/.github/workflows/Rally.yaml index 6e468c4bee..ea35930a93 100644 --- a/.github/workflows/Rally.yaml +++ b/.github/workflows/Rally.yaml @@ -25,10 +25,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 7266b83e2f..6a528be574 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -17,10 +17,10 @@ jobs: - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Build all projects run: ./scripts/gradlew_recursive.sh assembleDebug diff --git a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt index 162e02281c..fd46d81fab 100644 --- a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt +++ b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01" const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}" object GoogleMaps { @@ -30,7 +30,7 @@ object Libs { } object Accompanist { - private const val version = "0.3.4.compose-6995125-SNAPSHOT" + private const val version = "0.4.0" const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version" } @@ -49,15 +49,15 @@ object Libs { object AndroidX { object Compose { - const val snapshot = "6995125" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-alpha08" const val runtime = "androidx.compose.runtime:runtime:$version" const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version" const val material = "androidx.compose.material:material:$version" const val foundation = "androidx.compose.foundation:foundation:$version" const val layout = "androidx.compose.foundation:foundation-layout:$version" - const val tooling = "androidx.compose.ui:ui-tooling:${Compose.version}" + const val tooling = "androidx.compose.ui:ui-tooling:$version" const val animation = "androidx.compose.animation:animation:$version" const val uiTest = "androidx.compose.ui:ui-test-junit4:$version" } diff --git a/Crane/gradle/wrapper/gradle-wrapper.properties b/Crane/gradle/wrapper/gradle-wrapper.properties index fd57ef47b9..59a4725244 100644 --- a/Crane/gradle/wrapper/gradle-wrapper.properties +++ b/Crane/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Oct 23 09:30:32 CEST 2020 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/JetNews/build.gradle b/JetNews/build.gradle index ce97992992..1b7613c96b 100644 --- a/JetNews/build.gradle +++ b/JetNews/build.gradle @@ -16,7 +16,7 @@ buildscript { ext.kotlin_version = '1.4.20' - ext.compose_version = '1.0.0-SNAPSHOT' + ext.compose_version = '1.0.0-alpha08' ext.coroutines_version = '1.4.1' repositories { @@ -25,7 +25,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0-alpha16' + classpath 'com.android.tools.build:gradle:7.0.0-alpha01' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -36,10 +36,6 @@ plugins { subprojects { repositories { - maven { - def snapshot = "7001724" - url "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/" - } google() jcenter() } diff --git a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt index 44d5673c89..1ba2cbbace 100644 --- a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt +++ b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01" const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9" const val junit = "junit:junit:4.13" @@ -29,7 +29,7 @@ object Libs { const val material = "com.google.android.material:material:1.1.0" object Accompanist { - private const val version = "0.3.4.compose-7001724-SNAPSHOT" + private const val version = "0.4.0" const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version" const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version" } @@ -62,8 +62,8 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04" object Compose { - private const val snapshot = "7001724" - const val version = "1.0.0-SNAPSHOT" + private const val snapshot = "" + const val version = "1.0.0-alpha08" @get:JvmStatic val snapshotUrl: String diff --git a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt index 3f9d642fba..26ed957d92 100644 --- a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt +++ b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01" const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9" const val junit = "junit:junit:4.13" @@ -52,8 +52,8 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04" object Compose { - const val snapshot = "6995125" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-alpha08" const val foundation = "androidx.compose.foundation:foundation:$version" const val layout = "androidx.compose.foundation:foundation-layout:$version" diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties index 436aaff960..88fae9754d 100644 --- a/Jetchat/gradle/wrapper/gradle-wrapper.properties +++ b/Jetchat/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip diff --git a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt index 09636f6396..c4c5308e76 100644 --- a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt +++ b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt @@ -21,11 +21,11 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01" const val junit = "junit:junit:4.13" object Accompanist { - private const val version = "0.3.4.compose-7001724-SNAPSHOT" + private const val version = "0.4.0" const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version" const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version" } @@ -48,8 +48,8 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04" object Compose { - const val snapshot = "7001724" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-alpha08" const val foundation = "androidx.compose.foundation:foundation:${version}" const val layout = "androidx.compose.foundation:foundation-layout:${version}" diff --git a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt index c3e5b6f97a..8f70f06a4d 100644 --- a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt +++ b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01" const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9" const val junit = "junit:junit:4.13" @@ -29,7 +29,7 @@ object Libs { const val material = "com.google.android.material:material:1.1.0" object Accompanist { - private const val version = "0.3.4.compose-7001724-SNAPSHOT" + private const val version = "0.4.0" const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version" } @@ -52,8 +52,8 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01" object Compose { - const val snapshot = "7001724" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-alpha08" @get:JvmStatic val snapshotUrl: String diff --git a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt index 18546dbfdf..746c798e0f 100644 --- a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt +++ b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt @@ -21,11 +21,11 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01" const val junit = "junit:junit:4.13" object Accompanist { - private const val version = "0.3.4.compose-7001724-SNAPSHOT" + private const val version = "0.4.0" const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version" const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version" } @@ -46,11 +46,11 @@ object Libs { object AndroidX { const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04" - const val navigation = "androidx.navigation:navigation-compose:1.0.0-SNAPSHOT" + const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha03" object Compose { - const val snapshot = "7001724" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-alpha08" const val animation = "androidx.compose.animation:animation:$version" const val foundation = "androidx.compose.foundation:foundation:$version" diff --git a/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt b/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt index 04bbb846a9..25134a129d 100644 --- a/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt +++ b/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01" const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9" const val junit = "junit:junit:4.13" @@ -47,8 +47,8 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02" object Compose { - const val snapshot = "6995125" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-alpha08" const val core = "androidx.compose.ui:ui:$version" const val foundation = "androidx.compose.foundation:foundation:$version" diff --git a/Rally/gradle/wrapper/gradle-wrapper.properties b/Rally/gradle/wrapper/gradle-wrapper.properties index 436aaff960..88fae9754d 100644 --- a/Rally/gradle/wrapper/gradle-wrapper.properties +++ b/Rally/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip