diff --git a/android/build.gradle b/android/build.gradle index a34e8e0..11083cc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 28 defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" ndk { @@ -20,7 +19,7 @@ android { dependencies { implementation 'com.facebook.react:react-native:+' - implementation 'com.android.support:recyclerview-v7:25.0.1' - implementation 'com.google.zxing:core:3.3.0' - implementation group: 'com.drewnoakes', name: 'metadata-extractor', version: '2.9.1' + implementation 'com.android.support:recyclerview-v7:28.0.1' + implementation 'com.google.zxing:core:3.4.0' + implementation group: 'com.drewnoakes', name: 'metadata-extractor', version: '2.12.0' } diff --git a/example-android/app/build.gradle b/example-android/app/build.gradle index c69a28b..b90819c 100644 --- a/example-android/app/build.gradle +++ b/example-android/app/build.gradle @@ -25,13 +25,12 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 28 defaultConfig { applicationId "com.camerakit" minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" ndk { @@ -82,7 +81,7 @@ configurations.all { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) 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.facebook.react:react-native:+" // From node_modules } diff --git a/example-android/build.gradle b/example-android/build.gradle index 0476390..c5259a3 100644 --- a/example-android/build.gradle +++ b/example-android/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } 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 // in the individual module build.gradle files @@ -29,12 +29,11 @@ subprojects { task allDeps(type: DependencyReportTask) {} afterEvaluate { android { - compileSdkVersion 26 - buildToolsVersion "26.0.1" + compileSdkVersion 28 defaultConfig { minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 28 } } } diff --git a/example-android/gradle.properties b/example-android/gradle.properties index 1fd964e..e77af9f 100644 --- a/example-android/gradle.properties +++ b/example-android/gradle.properties @@ -18,3 +18,5 @@ # org.gradle.parallel=true android.useDeprecatedNdk=true +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/example-android/gradle/wrapper/gradle-wrapper.properties b/example-android/gradle/wrapper/gradle-wrapper.properties index e745035..f00389b 100644 --- a/example-android/gradle/wrapper/gradle-wrapper.properties +++ b/example-android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 15 15:43:54 IST 2018 +#Tue Nov 26 12:27:22 IST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip