Skip to content

Commit 9431ca2

Browse files
committedNov 30, 2020
Update to snapshot 7001724.
Also gradle 6.7.1 Change-Id: Ida6be4c9cf14fd5d3f57ac72fc468ffc360dd5ef
1 parent 467c062 commit 9431ca2

File tree

7 files changed

+13
-28
lines changed

7 files changed

+13
-28
lines changed
 

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/Home.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ private fun JetsnackBottomNavItemLayout(
287287
modifier = Modifier
288288
.layoutId("text")
289289
.padding(start = TextIconSpacing)
290-
.graphicsLayer(
291-
alpha = animationProgress,
292-
scaleX = scale,
293-
scaleY = scale,
290+
.graphicsLayer {
291+
alpha = animationProgress
292+
scaleX = scale
293+
scaleY = scale
294294
transformOrigin = BottomNavLabelTransformOrigin
295-
),
295+
},
296296
content = text
297297
)
298298
}

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private fun Title(snack: Snack, scroll: Float) {
218218
modifier = Modifier
219219
.preferredHeightIn(min = TitleHeight)
220220
.statusBarsPadding()
221-
.graphicsLayer(translationY = offset)
221+
.graphicsLayer { translationY = offset }
222222
.background(color = JetsnackTheme.colors.uiBackground)
223223
) {
224224
Spacer(Modifier.preferredHeight(16.dp))

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

+2-2
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.3.4.compose-6994167-SNAPSHOT"
28+
private const val version = "0.3.4.compose-7001724-SNAPSHOT"
2929
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3030
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
3131
}
@@ -48,7 +48,7 @@ object Libs {
4848
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04"
4949

5050
object Compose {
51-
const val snapshot = "6994167"
51+
const val snapshot = "7001724"
5252
const val version = "1.0.0-SNAPSHOT"
5353

5454
const val foundation = "androidx.compose.foundation:foundation:${version}"
293 Bytes
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎Jetsnack/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

‎Jetsnack/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)