upgrade libs to 28

This commit is contained in:
Ward Abbass 2019-11-26 12:32:28 +02:00
parent f300209b28
commit 513ee69f91
5 changed files with 15 additions and 16 deletions

View File

@ -1,12 +1,11 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 25 compileSdkVersion 28
buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 25 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
ndk { ndk {
@ -20,7 +19,7 @@ android {
dependencies { dependencies {
implementation 'com.facebook.react:react-native:+' implementation 'com.facebook.react:react-native:+'
implementation 'com.android.support:recyclerview-v7:25.0.1' implementation 'com.android.support:recyclerview-v7:28.0.1'
implementation 'com.google.zxing:core:3.3.0' implementation 'com.google.zxing:core:3.4.0'
implementation group: 'com.drewnoakes', name: 'metadata-extractor', version: '2.9.1' implementation group: 'com.drewnoakes', name: 'metadata-extractor', version: '2.12.0'
} }

View File

@ -25,13 +25,12 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false def enableProguardInReleaseBuilds = false
android { android {
compileSdkVersion 26 compileSdkVersion 28
buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
applicationId "com.camerakit" applicationId "com.camerakit"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 25 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
ndk { ndk {
@ -82,7 +81,7 @@ configurations.all {
dependencies { dependencies {
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
compile project(":rncamerakit") compile project(":rncamerakit")
compile "com.android.support:appcompat-v7:26.0.1" compile "com.android.support:appcompat-v7:28.0.1"
compile 'com.android.support:multidex:1.0.3' compile 'com.android.support:multidex:1.0.3'
compile "com.facebook.react:react-native:+" // From node_modules compile "com.facebook.react:react-native:+" // From node_modules
} }

View File

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.5.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -29,12 +29,11 @@ subprojects {
task allDeps(type: DependencyReportTask) {} task allDeps(type: DependencyReportTask) {}
afterEvaluate { afterEvaluate {
android { android {
compileSdkVersion 26 compileSdkVersion 28
buildToolsVersion "26.0.1"
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 25 targetSdkVersion 28
} }
} }
} }

View File

@ -18,3 +18,5 @@
# org.gradle.parallel=true # org.gradle.parallel=true
android.useDeprecatedNdk=true android.useDeprecatedNdk=true
android.useAndroidX=true
android.enableJetifier=true

View File

@ -1,6 +1,6 @@
#Thu Mar 15 15:43:54 IST 2018 #Tue Nov 26 12:27:22 IST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip