diff --git a/build.gradle b/build.gradle index 6e6ec4815452c3468147f82ad45b40bbfc5f7f10..851df4e8a7a64d335450f9464199c1701ee46ab5 100644 --- a/build.gradle +++ b/build.gradle @@ -24,14 +24,13 @@ buildscript { androidGradlePluginVersion = "3.2.0-beta04" androidMavenGradlePluginVersion = "1.5" - androidxCoreVersion = "1.0.0-beta01" - androidxEspressoVersion = "3.1.0-alpha3" - androidxTestVersion = "1.1.0-alpha3" + androidxCoreVersion = "1.0.0" + androidxEspressoVersion = "3.1.0-alpha4" + androidxTestVersion = "1.1.0-alpha4" junitVersion = "4.12" gradleBintrayPluginVersion = "1.6" - kotlinVersion = "1.2.51" - materialVersion = "1.0.0-beta01" - testRunnerVersion = "1.0.0" + kotlinVersion = "1.2.70" + materialVersion = "1.0.0" } repositories { diff --git a/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt b/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt index 454626e15f76135c2ca7f603ea7191cb28cbdde1..6a2d169f14da6e075da42f48a1208213b208d5d2 100644 --- a/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt +++ b/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt @@ -33,9 +33,9 @@ import androidx.test.runner.AndroidJUnit4 import com.google.android.apps.flexbox.R import com.google.android.flexbox.* import com.google.android.material.navigation.NavigationView -import junit.framework.Assert.* import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.core.Is.`is` +import org.junit.Assert.* import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/flexbox/constants.gradle b/flexbox/constants.gradle index d5a7a57c158433aece4ad8b6529ce9805f13d217..b4f03e915887ba2ae83c1c9d87687f8231c9a6ac 100644 --- a/flexbox/constants.gradle +++ b/flexbox/constants.gradle @@ -22,7 +22,7 @@ ext { mavenGroup = 'com.google.android' mavenArtifactId = 'flexbox' - mavenVersion = '1.1.0-beta1' + mavenVersion = '1.1.0' bintrayOrg = 'google' } diff --git a/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt b/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt index 62eff9842a5b6ea27f732342e1a6bbebba117317..4b1443004c624f28633ac6739af0ea60f983803a 100644 --- a/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt +++ b/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt @@ -21,9 +21,9 @@ import androidx.test.rule.ActivityTestRule import androidx.test.runner.AndroidJUnit4 import com.google.android.flexbox.test.FlexboxTestActivity import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError -import junit.framework.Assert.assertEquals -import junit.framework.Assert.assertNotNull import org.hamcrest.Matchers.`is` +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull import org.junit.Assert.assertThat import org.junit.Before import org.junit.Rule diff --git a/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt b/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt index 3ede0249bed96503d33cd10122fa4afa1d621235..520d557c74c76392ab35b8c7bc61de3a7c7e804f 100644 --- a/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt +++ b/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt @@ -30,7 +30,7 @@ class ConfigChangeActivity : Activity() { override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - Log.d(TAG, "onConfigurationChanged: " + newConfig) + Log.d(TAG, "onConfigurationChanged: $newConfig") } companion object { diff --git a/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt b/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt index 7988d75132e0007d262085d4093041fd451057d7..7e5fef65c09288fafbde0658f4daf2a4fafaa410 100644 --- a/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt +++ b/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt @@ -34,14 +34,14 @@ import androidx.test.rule.ActivityTestRule import androidx.test.runner.AndroidJUnit4 import com.google.android.flexbox.* import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError -import junit.framework.Assert.assertEquals -import junit.framework.Assert.assertTrue import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher import org.hamcrest.core.Is.`is` import org.hamcrest.core.IsNot.not +import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Assert.assertThat +import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -4015,7 +4015,7 @@ class FlexboxAndroidTest { private fun hasWidth(width: Int): ViewAssertion { return matches(object : TypeSafeMatcher() { override fun describeTo(description: Description) { - description.appendText("expected width: " + width) + description.appendText("expected width: $width") } override fun describeMismatchSafely(item: View, mismatchDescription: Description) { @@ -4029,7 +4029,7 @@ class FlexboxAndroidTest { private fun hasHeight(height: Int): ViewAssertion { return matches(object : TypeSafeMatcher() { override fun describeTo(description: Description) { - description.appendText("expected height: " + height) + description.appendText("expected height: $height") } override fun describeMismatchSafely(item: View, mismatchDescription: Description) { diff --git a/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt b/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt index 0bc00a5a79579b481f897b145a3b7ec3c8cdc915..f0f85a77fb3d6a60cf61c1e37d74108a197a5f17 100644 --- a/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt +++ b/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt @@ -37,10 +37,10 @@ import com.google.android.flexbox.* import com.google.android.flexbox.FlexboxItemDecoration.HORIZONTAL import com.google.android.flexbox.FlexboxItemDecoration.VERTICAL import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError -import junit.framework.Assert.assertTrue import org.hamcrest.Matchers.* import org.hamcrest.core.IsNot.not import org.junit.Assert.assertThat +import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 05ef575b0cd0173fc735f2857ce4bd594ce4f6bd..f6b961fd5a86aa5fbfe90f707c3138408be7c718 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1c68cd54f05f8e736e546f017dcc4490a9a603d2..39898483839b37c8704a46672da8dbd87370f367 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 08 15:37:09 JST 2018 +#Mon Sep 24 09:09:16 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/gradlew b/gradlew index 9d82f78915133e1c35a6ea51252590fb38efac2f..cccdd3d517fc5249beaefa600691cf150f2fa3e6 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730b4e8fcd90b57a0e8e01544fea7c31a89..e95643d6a2ca62258464e83c72f5156dc941c609 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line