Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 59e6fe6

Browse files
yrezguiyrezgui
authoredMar 11, 2021
Merge pull request android#436 from yrezgui/dev_beta02
[All] Update snapshots to beta02
2 parents 87916da + 549d130 commit 59e6fe6

File tree

13 files changed

+40
-49
lines changed

13 files changed

+40
-49
lines changed
 

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

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

3232
object Accompanist {
33-
private const val version = "0.6.2.compose-7184376-SNAPSHOT"
33+
private const val version = "0.6.2"
3434
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3535
}
3636

@@ -49,14 +49,14 @@ object Libs {
4949

5050
object AndroidX {
5151
object Activity {
52-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
52+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
5353
}
5454

5555
const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
5656

5757
object Compose {
58-
const val snapshot = "7184376"
59-
private const val version = "1.0.0-SNAPSHOT"
58+
const val snapshot = ""
59+
private const val version = "1.0.0-beta02"
6060

6161
const val runtime = "androidx.compose.runtime:runtime:$version"
6262
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -70,7 +70,7 @@ object Libs {
7070

7171
object Lifecycle {
7272
private const val version = "2.3.0"
73-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
73+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
7474
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
7575
}
7676

‎JetNews/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ dependencies {
9191
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
9292

9393
implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
94-
implementation 'androidx.activity:activity-ktx:1.2.0'
95-
implementation 'androidx.core:core-ktx:1.5.0-beta02'
96-
implementation "androidx.activity:activity-compose:1.3.0-alpha03"
94+
implementation 'androidx.activity:activity-ktx:1.2.1'
95+
implementation 'androidx.core:core-ktx:1.5.0-beta03'
96+
implementation "androidx.activity:activity-compose:1.3.0-alpha04"
9797

9898
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0"
9999
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0"
100-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
100+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
101101

102102
androidTestImplementation 'androidx.test:rules:1.3.0'
103103
androidTestImplementation 'androidx.test:runner:1.3.0'

‎JetNews/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
buildscript {
1818
ext.kotlin_version = '1.4.31'
19-
ext.compose_version = '1.0.0-SNAPSHOT'
19+
ext.compose_version = '1.0.0-beta02'
2020
ext.coroutines_version = '1.4.2'
2121

2222
repositories {
@@ -36,7 +36,6 @@ plugins {
3636

3737
subprojects {
3838
repositories {
39-
maven { url "https://androidx.dev/snapshots/builds/7184376/artifacts/repository/" }
4039
google()
4140
jcenter()
4241
}

‎Jetcaster/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ subprojects {
4343
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4444
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
4545
}
46-
47-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
4846
}
4947

5048
apply plugin: 'com.diffplug.spotless'

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object Libs {
2727
const val material = "com.google.android.material:material:1.1.0"
2828

2929
object Accompanist {
30-
private const val version = "0.6.2.compose-7184376-SNAPSHOT"
30+
private const val version = "0.6.2"
3131
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3232
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
3333
}
@@ -61,19 +61,19 @@ object Libs {
6161
const val appcompat = "androidx.appcompat:appcompat:1.2.0"
6262
const val palette = "androidx.palette:palette:1.0.0"
6363

64-
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"
64+
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
6565

6666
object Activity {
67-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
67+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
6868
}
6969

7070
object Constraint {
7171
const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha03"
7272
}
7373

7474
object Compose {
75-
private const val snapshot = "7184376"
76-
private const val version = "1.0.0-SNAPSHOT"
75+
private const val snapshot = ""
76+
private const val version = "1.0.0-beta02"
7777

7878
@get:JvmStatic
7979
val snapshotUrl: String
@@ -92,7 +92,7 @@ object Libs {
9292

9393
object Lifecycle {
9494
private const val version = "2.3.0-beta01"
95-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
95+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
9696
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
9797
}
9898

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ object Libs {
4343
}
4444

4545
object Accompanist {
46-
private const val version = "0.6.2.compose-7184376-SNAPSHOT"
46+
private const val version = "0.6.2"
4747
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
4848
}
4949

5050
object AndroidX {
51-
const val appcompat = "androidx.appcompat:appcompat:1.2.0-rc01"
52-
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta02"
51+
const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
52+
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
5353

5454
object Activity {
55-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
55+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
5656
}
5757

5858
object Compose {
59-
const val snapshot = "7184376"
60-
const val version = "1.0.0-SNAPSHOT"
59+
const val snapshot = ""
60+
const val version = "1.0.0-beta02"
6161

6262
const val foundation = "androidx.compose.foundation:foundation:$version"
6363
const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -96,7 +96,7 @@ object Libs {
9696
const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
9797
const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
9898
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
99-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
99+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
100100
}
101101
}
102102
}

‎Jetsnack/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ subprojects {
4040

4141
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4242
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
43-
maven { url "http://androidx.dev/storage/repository/androidx/constraintlayout" }
4443
}
45-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4644
}
4745

4846
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object Libs {
2424
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha09"
2525

2626
object Accompanist {
27-
private const val version = "0.6.2.compose-7184376-SNAPSHOT"
27+
private const val version = "0.6.2"
2828
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
2929
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
3030
}
@@ -44,11 +44,11 @@ object Libs {
4444
}
4545

4646
object AndroidX {
47-
const val coreKtx = "androidx.core:core-ktx:1.5.0-SNAPSHOT"
47+
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
4848

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

5353
const val foundation = "androidx.compose.foundation:foundation:${version}"
5454
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
@@ -62,12 +62,12 @@ object Libs {
6262
}
6363

6464
object Activity {
65-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
65+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
6666
}
6767

6868
object Lifecycle {
6969
const val viewModelCompose =
70-
"androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
70+
"androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
7171
}
7272

7373
object ConstraintLayout {

‎Jetsurvey/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ subprojects {
4141
if (Libs.AndroidX.Compose.version.endsWith('SNAPSHOT')) {
4242
maven { url Libs.AndroidX.Compose.snapshotUrl }
4343
}
44-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4544
}
4645

4746
apply plugin: 'com.diffplug.spotless'

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +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.6.2.compose-7184376-SNAPSHOT"
32+
private const val version = "0.6.2"
3333
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3434
}
3535

@@ -49,21 +49,21 @@ object Libs {
4949

5050
object AndroidX {
5151
const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
52-
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
52+
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
5353

5454
object Lifecycle {
5555
private const val version = "2.3.0-beta01"
56-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
56+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
5757
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
5858
}
5959

6060
object Activity {
61-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
61+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
6262
}
6363

6464
object Compose {
65-
const val snapshot = "7184376"
66-
const val version = "1.0.0-SNAPSHOT"
65+
const val snapshot = ""
66+
const val version = "1.0.0-beta02"
6767

6868
@get:JvmStatic
6969
val snapshotUrl: String

‎Owl/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ subprojects {
3939

4040
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4141
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
42-
maven { url "http://androidx.dev/storage/repository/androidx/constraintlayout" }
4342
}
44-
45-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
4643
}
4744

4845
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ object Libs {
6969
}
7070

7171
object Activity {
72-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
72+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
7373
}
7474

7575
object ConstraintLayout {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ object Libs {
4242

4343
object AndroidX {
4444
const val appcompat = "androidx.appcompat:appcompat:1.2.0-rc01"
45-
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
45+
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
4646

4747
object Activity {
48-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
48+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
4949
}
5050

5151
object Compose {
52-
const val snapshot = "7184376"
53-
const val version = "1.0.0-SNAPSHOT"
52+
const val snapshot = ""
53+
const val version = "1.0.0-beta02"
5454

5555
const val core = "androidx.compose.ui:ui:$version"
5656
const val foundation = "androidx.compose.foundation:foundation:$version"

0 commit comments

Comments
 (0)
Please sign in to comment.