diff options
| -rw-r--r-- | build.gradle | 7 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | sample/build.gradle | 7 | ||||
| -rw-r--r-- | zxing-android-embedded/build.gradle | 1 |
4 files changed, 5 insertions, 12 deletions
diff --git a/build.gradle b/build.gradle index 984de003..94aecb02 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' } } @@ -20,11 +20,6 @@ subprojects { version = '4.0.2' group = 'com.journeyapps' - ext.androidBuildTools = '28.0.3' ext.androidTargetSdk = 28 ext.zxingCore = 'com.google.zxing:core:3.4.0' } - -repositories { - google() -}
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0bf649d..0cbd65f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index 5be3a4c7..a3169342 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion project.androidTargetSdk - buildToolsVersion project.androidBuildTools defaultConfig { minSdkVersion 24 @@ -22,9 +21,9 @@ android { keystoreFile = properties.getProperty('keystore.file') keystorePassword = properties.getProperty('keystore.password') keystoreAlias = properties.getProperty('keystore.alias') - validConfig = keystoreFile != null && keystorePassword != null && keystoreAlias != null; + validConfig = keystoreFile != null && keystorePassword != null && keystoreAlias != null } catch (error) { - validConfig = false; + validConfig = false } if (validConfig) { @@ -63,7 +62,7 @@ dependencies { // implementation 'com.journeyapps:zxing-android-embedded:<version>' implementation project(':zxing-android-embedded') - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' // leakcanary is for development purposes only diff --git a/zxing-android-embedded/build.gradle b/zxing-android-embedded/build.gradle index 345da548..4e5cc724 100644 --- a/zxing-android-embedded/build.gradle +++ b/zxing-android-embedded/build.gradle @@ -17,7 +17,6 @@ dependencies { android { resourcePrefix 'zxing_' compileSdkVersion project.androidTargetSdk - buildToolsVersion project.androidBuildTools sourceSets { main { |