diff --git a/.gitignore b/.gitignore index 95367758..2fecce14 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ node_modules/ npm-debug.log yarn-error.log - + # Xcode # @@ -29,7 +29,7 @@ DerivedData *.ipa *.xcuserstate project.xcworkspace - + # Android/IntelliJ # @@ -45,4 +45,5 @@ buck-out/ *.keystore # Editor config -.vscode \ No newline at end of file +.vscode + diff --git a/android/build.gradle b/android/build.gradle index fcabf848..889ebaa6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,21 +1,5 @@ - -buildscript { - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' - } -} - -def getExtOrDefault(name) { - return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['RNAsyncStorage_' + name] -} - -def getExtOrIntegerDefault(name) { - return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['RNAsyncStorage_' + name]).toInteger() +def getExtOrDefault(name, defaultValue) { + return rootProject.ext.has(name) ? rootProject.ext.get(name) : defaultValue } // AsyncStorage has default size of 6MB. @@ -37,12 +21,11 @@ def useDedicatedExecutor = rootProject.hasProperty('AsyncStorage_dedicatedExecut apply plugin: 'com.android.library' android { - compileSdkVersion getExtOrIntegerDefault('compileSdkVersion') - buildToolsVersion getExtOrDefault('buildToolsVersion') + compileSdkVersion getExtOrDefault('compileSdkVersion', 28) defaultConfig { - minSdkVersion getExtOrIntegerDefault('minSdkVersion') - targetSdkVersion getExtOrIntegerDefault('targetSdkVersion') + minSdkVersion getExtOrDefault('minSdkVersion', 16) + targetSdkVersion getExtOrDefault('targetSdkVersion', 28) buildConfigField "Long", "AsyncStorage_db_size", "${dbSizeInMB}L" buildConfigField("boolean", "AsyncStorage_useDedicatedExecutor", "${useDedicatedExecutor}") @@ -50,6 +33,7 @@ android { } repositories { + google() mavenCentral() } diff --git a/android/gradle.properties b/android/gradle.properties deleted file mode 100644 index 109465ba..00000000 --- a/android/gradle.properties +++ /dev/null @@ -1,4 +0,0 @@ -RNAsyncStorage_compileSdkVersion=28 -RNAsyncStorage_buildToolsVersion=28.0.3 -RNAsyncStorage_targetSdkVersion=28 -RNAsyncStorage_minSdkVersion=19 \ No newline at end of file