Skip to content

Commit 19ae77e

Browse files
chrisbaneschrisbanes
authored
[Most] Update most samples to Compose 1.0.0-alpha12 (android#385)
Removed our hacks for the alpha12 snapshots Added activity-compose as androidTestImplementations where necessary Updated Gradle to 6.8.2 for all Updated ktlint to 0.40.0 for all Updated Spotless to 5.10.0 for all
1 parent c69b73b commit 19ae77e

File tree

40 files changed

+428
-456
lines changed

40 files changed

+428
-456
lines changed

Diff for: ‎Crane/app/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ dependencies {
123123
implementation Libs.Hilt.android
124124
kapt Libs.Hilt.compiler
125125

126+
// FIXME: only needed for Compose alpha12
127+
androidTestImplementation Libs.AndroidX.Activity.activityCompose
128+
126129
androidTestImplementation Libs.JUnit.junit
127130
androidTestImplementation Libs.AndroidX.Test.runner
128131
androidTestImplementation Libs.AndroidX.Test.espressoCore

Diff for: ‎Crane/build.gradle

+1-16
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ buildscript {
3131
}
3232

3333
plugins {
34-
id 'com.diffplug.spotless' version '5.8.2'
34+
id 'com.diffplug.spotless' version '5.10.0'
3535
}
3636

3737
subprojects {
@@ -69,18 +69,3 @@ subprojects {
6969
}
7070
}
7171
}
72-
73-
subprojects {
74-
// FIXME: Only needed for Compose 1.0.0-alpha12 snapshots
75-
configurations.configureEach {
76-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
77-
if (details.requested.group == 'androidx.lifecycle' &&
78-
details.requested.name != 'lifecycle-viewmodel-compose') {
79-
details.useVersion('2.3.0-rc01')
80-
}
81-
if (details.requested.group == 'androidx.savedstate') {
82-
details.useVersion('1.1.0-rc01')
83-
}
84-
}
85-
}
86-
}

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

+5-5
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.5.1.compose-7123292-SNAPSHOT"
33+
private const val version = "0.5.1"
3434
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3535
}
3636

@@ -49,12 +49,12 @@ 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-alpha02"
5353
}
5454

5555
object Compose {
56-
const val snapshot = "7123292"
57-
private const val version = "1.0.0-SNAPSHOT"
56+
const val snapshot = ""
57+
private const val version = "1.0.0-alpha12"
5858

5959
const val runtime = "androidx.compose.runtime:runtime:$version"
6060
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -68,7 +68,7 @@ object Libs {
6868

6969
object Lifecycle {
7070
private const val version = "2.3.0-beta01"
71-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
71+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha01"
7272
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
7373
}
7474

Diff for: ‎Crane/gradle/wrapper/gradle-wrapper.jar

4.76 KB
Binary file not shown.

Diff for: ‎Crane/gradle/wrapper/gradle-wrapper.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Oct 23 09:30:32 CEST 2020
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

Diff for: ‎Crane/gradlew

+33-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

@@ -159,14 +177,9 @@ save () {
159177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160178
echo " "
161179
}
162-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
163181

164182
# Collect all arguments for the java command, following the shell quoting and substitution rules
165183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166184

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172185
exec "$JAVACMD" "$@"

Diff for: ‎Crane/gradlew.bat

+24-19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
1329
set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
1635
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1837

1938
@rem Find java.exe
2039
if defined JAVA_HOME goto findJavaFromJavaHome
2140

2241
set JAVA_EXE=java.exe
2342
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
2544

2645
echo.
2746
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
3554
set JAVA_HOME=%JAVA_HOME:"=%
3655
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
3756

38-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
3958

4059
echo.
4160
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
4564

4665
goto fail
4766

48-
:init
49-
@rem Get command-line arguments, handling Windows variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
53-
:win9xME_args
54-
@rem Slurp the command line arguments.
55-
set CMD_LINE_ARGS=
56-
set _SKIP=2
57-
58-
:win9xME_args_slurp
59-
if "x%~1" == "x" goto execute
60-
61-
set CMD_LINE_ARGS=%*
62-
6367
:execute
6468
@rem Setup the command line
6569

6670
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6771

72+
6873
@rem Execute Gradle
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7075

7176
:end
7277
@rem End local scope for the variables with windows NT shell

Diff for: ‎JetNews/app/build.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,15 @@ dependencies {
9292

9393
implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
9494
implementation 'androidx.activity:activity-ktx:1.1.0'
95-
implementation 'androidx.core:core-ktx:1.5.0-SNAPSHOT'
96-
implementation "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
95+
implementation 'androidx.core:core-ktx:1.5.0-beta01'
96+
implementation "androidx.activity:activity-compose:1.3.0-alpha02"
9797

9898
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0-rc01"
9999
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-rc01"
100-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
100+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha01"
101+
102+
// FIXME: only needed for Compose alpha12
103+
androidTestImplementation "androidx.activity:activity-compose:1.3.0-alpha02"
101104

102105
androidTestImplementation 'junit:junit:4.13.1'
103106
androidTestImplementation 'androidx.test:rules:1.3.0'

Diff for: ‎JetNews/build.gradle

+3-20
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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

2222
repositories {
@@ -31,15 +31,11 @@ buildscript {
3131
}
3232

3333
plugins {
34-
id 'com.diffplug.spotless' version '5.7.0'
34+
id 'com.diffplug.spotless' version '5.10.0'
3535
}
3636

3737
subprojects {
3838
repositories {
39-
maven {
40-
def snapshot = "7123292"
41-
url "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
42-
}
4339
google()
4440
jcenter()
4541
}
@@ -51,21 +47,8 @@ subprojects {
5147
targetExclude("$buildDir/**/*.kt")
5248
targetExclude('bin/**/*.kt')
5349

54-
ktlint("0.39.0")
50+
ktlint("0.40.0")
5551
licenseHeaderFile rootProject.file('spotless/copyright.kt')
5652
}
5753
}
58-
59-
// FIXME: Only needed for Compose 1.0.0-alpha12 snapshots
60-
configurations.configureEach {
61-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
62-
if (details.requested.group == 'androidx.lifecycle' &&
63-
details.requested.name != 'lifecycle-viewmodel-compose') {
64-
details.useVersion('2.3.0-rc01')
65-
}
66-
if (details.requested.group == 'androidx.savedstate') {
67-
details.useVersion('1.1.0-rc01')
68-
}
69-
}
70-
}
7154
}

Diff for: ‎JetNews/gradle/wrapper/gradle-wrapper.jar

293 Bytes
Binary file not shown.

Diff for: ‎JetNews/gradle/wrapper/gradle-wrapper.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jan 28 15:37:57 CET 2021
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

Diff for: ‎JetNews/gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fi
130130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133-
133+
134134
JAVACMD=`cygpath --unix "$JAVACMD"`
135135

136136
# We build the pattern for arguments to be converted via cygpath

Diff for: ‎JetNews/gradlew.bat

+3-18
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
5454
set JAVA_HOME=%JAVA_HOME:"=%
5555
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

57-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5858

5959
echo.
6060
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
6464

6565
goto fail
6666

67-
:init
68-
@rem Get command-line arguments, handling Windows variants
69-
70-
if not "%OS%" == "Windows_NT" goto win9xME_args
71-
72-
:win9xME_args
73-
@rem Slurp the command line arguments.
74-
set CMD_LINE_ARGS=
75-
set _SKIP=2
76-
77-
:win9xME_args_slurp
78-
if "x%~1" == "x" goto execute
79-
80-
set CMD_LINE_ARGS=%*
81-
8267
:execute
8368
@rem Setup the command line
8469

8570
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8671

8772

8873
@rem Execute Gradle
89-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
9075

9176
:end
9277
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)