From fcfa675b529ff68d7989b8eb977b61cc50a2d824 Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Tue, 5 Nov 2019 12:11:32 -0800 Subject: [PATCH 1/2] Update Gradle Wrapper scripts --- gradle.properties | 9 +++++++-- gradle/wrapper/gradle-wrapper.properties | 3 +-- gradlew | 6 +++--- gradlew.bat | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index ec9ff61b..d74ceb59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,6 +16,13 @@ org.gradle.jvmargs=-Xmx1536m # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true + VERSION_NAME=4.2.3 VERSION_CODE=54 GROUP=com.wdullaer @@ -35,5 +42,3 @@ POM_LICENCE_URL=https://github.com/wdullaer/MaterialDateTimePicker/blob/master/L POM_LICENCE_DIST=repo POM_DEVELOPER_ID=wdullaer POM_DEVELOPER_NAME=Wouter Dullaert - -android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5eea6e21..0ebb3108 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Apr 18 14:00:14 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/gradlew b/gradlew index b0d6d0ab..83f2acfd 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 15e1ee37..24467a14 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, From b52b5ca3f47a5ffead8ea54143da71c59a26c0ce Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Wed, 10 Jun 2020 13:48:31 -0700 Subject: [PATCH 2/2] Disable Jetifier --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d74ceb59..a60850aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx1536m # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true +#android.enableJetifier=true VERSION_NAME=4.2.3 VERSION_CODE=54