Skip to content

[All] Updating to Compose alpha08 #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yrezgui merged 3 commits into from
Dec 3, 2020
Merged

[All] Updating to Compose alpha08 #307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6df7995
[All] Update to Compose 1.0.0-alpha08
yrezgui Dec 3, 2020
3ec9bca
Upgrade to Java 11
yrezgui Dec 3, 2020
993bb2e
Upgrade to Java 11 for all samples
yrezgui Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[All] Update to Compose 1.0.0-alpha08 
Upgrade Android Gradle plugin to 7.0.0-alpha01
Upgrade Gradle to 6.7.1
  • Loading branch information
@yrezgui
yrezgui committed Dec 3, 2020
commit 6df799511991c16636fd86fdf17ab6f8516e9249
10 changes: 5 additions & 5 deletions Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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"
}

Expand All @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion Crane/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 2 additions & 6 deletions JetNews/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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"
}
}
Expand All @@ -36,10 +36,6 @@ plugins {

subprojects {
repositories {
maven {
def snapshot = "7001724"
url "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
}
google()
jcenter()
}
Expand Down
8 changes: 4 additions & 4 deletions Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ 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"

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"
}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Jetchat/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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}"
Expand Down
8 changes: 4 additions & 4 deletions Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ 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"

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"
}

Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Rally/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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