upgrade gradle wrapper to v5.2.1, fixes #87

tanersener · Feb 20, 2019 · 38fd55e · 38fd55e
1 parent 801377f
commit 38fd55e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 9 deletions.
diff --git a/android.sh b/android.sh
@@ -693,7  693,7 @@ if [[ ! -z ${ANDROID_ARCHITECTURES} ]]; then
         exit 1
     fi
 
-    cp ${BASEDIR}/android/app/build/outputs/aar/mobile-ffmpeg-*.aar ${MOBILE_FFMPEG_AAR}/mobile-ffmpeg.aar 1>>${BASEDIR}/build.log 2>&1
     cp ${BASEDIR}/android/app/build/outputs/aar/mobile-ffmpeg.aar ${MOBILE_FFMPEG_AAR}/mobile-ffmpeg.aar 1>>${BASEDIR}/build.log 2>&1
 
     if [ $? -ne 0 ]; then
         echo -e "failed\n"

diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5  1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/gradlew.bat b/android/gradlew.bat
diff --git a/android/test-app/build.gradle b/android/test-app/build.gradle
@@ -4,7  4,7 @@ android {
     signingConfigs {
         localConfig {
             keyAlias 'androiddebugkey'
-            storeFile file('/home/taner/.android/debug.keystore')
             storeFile file(System.getProperty("user.home")   '/.android/debug.keystore')
             storePassword 'android'
             keyPassword 'android'
         }
@@ -20,13  20,8 @@ android {
     }
     buildTypes {
         debug {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-        release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.localConfig
         }
     }
     splits {

diff --git a/android/test-app/gradle/wrapper/gradle-wrapper.properties b/android/test-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,5  1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists