Merge pull request #492 from journeyapps/upgrade

Upgrade tooling
journeyapps · Sep 7, 2019 · 3133240 · 3133240
2 parents 28c646b + c0c0fcd
commit 3133240
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 251 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ android:
     - tools
     - tools
     - platform-tools
-    - build-tools-27.0.3
+    - build-tools-28.0.3
 
     - extra-android-support
     - extra-android-m2repository

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 02 19:05:07 SAST 2018
+#Sat Sep 07 15:17:02 SAST 2019
 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-5.4.1-all.zip
diff --git a/sample-nosupport/.gitignore b/sample-nosupport/.gitignore
diff --git a/sample-nosupport/build.gradle b/sample-nosupport/build.gradle
diff --git a/sample-nosupport/proguard-rules.txt b/sample-nosupport/proguard-rules.txt
diff --git a/sample-nosupport/src/main/AndroidManifest.xml b/sample-nosupport/src/main/AndroidManifest.xml
diff --git a/sample-nosupport/src/main/java/example/zxing/MainActivity.java b/sample-nosupport/src/main/java/example/zxing/MainActivity.java
diff --git a/sample-nosupport/src/main/res/drawable-hdpi/icon.png b/sample-nosupport/src/main/res/drawable-hdpi/icon.png
diff --git a/sample-nosupport/src/main/res/drawable-mdpi/icon.png b/sample-nosupport/src/main/res/drawable-mdpi/icon.png
diff --git a/sample-nosupport/src/main/res/drawable-xhdpi/icon.png b/sample-nosupport/src/main/res/drawable-xhdpi/icon.png
diff --git a/sample-nosupport/src/main/res/drawable-xxhdpi/icon.png b/sample-nosupport/src/main/res/drawable-xxhdpi/icon.png
diff --git a/sample-nosupport/src/main/res/layout/activity_main.xml b/sample-nosupport/src/main/res/layout/activity_main.xml
diff --git a/sample-nosupport/src/main/res/layout/fragment_scan.xml b/sample-nosupport/src/main/res/layout/fragment_scan.xml
diff --git a/sample-nosupport/src/main/res/values/dimens.xml b/sample-nosupport/src/main/res/values/dimens.xml
diff --git a/sample-nosupport/src/main/res/values/strings.xml b/sample-nosupport/src/main/res/values/strings.xml
diff --git a/sample-nosupport/src/main/res/values/styles.xml b/sample-nosupport/src/main/res/values/styles.xml
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -51,6 +51,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 
@@ -59,13 +63,14 @@ dependencies {
     //   compile 'com.journeyapps:zxing-android-embedded:<version>'
     implementation project(':zxing-android-embedded')
 
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+
     // leakcanary is for development purposes only
     // https://github.com/square/leakcanary
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
 
     // AboutLibraries
-    implementation "com.mikepenz:aboutlibraries:6.2.0"
+    implementation "com.mikepenz:aboutlibraries:6.2.3"
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,2 @@
 include ':zxing-android-embedded'
 include ':sample'
-include ':sample-nosupport'
diff --git a/zxing-android-embedded/build.gradle b/zxing-android-embedded/build.gradle
@@ -37,8 +37,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     testOptions {