diff --git a/.gitignore b/.gitignore index 2c1792d..224fed7 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ build/ .gradle local.properties *.iml +.history # node.js # diff --git a/android/build.gradle b/android/build.gradle index 53a1a73..8ec5a49 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,23 +1,27 @@ apply plugin: "com.android.library" +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + android { - compileSdkVersion 25 - buildToolsVersion "25.0.1" + compileSdkVersion safeExtGet("compileSdkVersion", 25) + buildToolsVersion safeExtGet("buildToolsVersion", "25.0.1") defaultConfig { - minSdkVersion 16 - targetSdkVersion 23 + minSdkVersion safeExtGet("minSdkVersion", 16) + targetSdkVersion safeExtGet("targetSdkVersion", 23) versionCode 1 versionName "1.0" } } dependencies { - compile "com.facebook.react:react-native:+" // From node_modules - compile 'com.android.support:customtabs:25.0.1' - compile ('com.github.droibit.customtabslauncher:launcher:1.0.8') { + implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" + implementation 'com.android.support:customtabs:25.0.1' + implementation ('com.github.droibit.customtabslauncher:launcher:1.0.8') { exclude module: 'customtabs' } - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' } \ No newline at end of file diff --git a/package.json b/package.json index d0b3836..f77f12d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-custom-tabs", - "version": "0.1.7", + "version": "0.1.8", "description": "Chrome Custom Tabs for React Native.", "keywords": [ "react-native",