feat: increase uploadservice-okhttp, Kotlin version, (Vydia#337, Vydia#344, Vydia#347)

Author: uspython

android/build.gradle

@@ -1,70 +1,121 @@
 buildscript {
-    ext {
-        kotlinVersion = '1.6.0'
-        buildToolsVersion = '29.0.2'
-        compileSdkVersion = 29
-        targetSdkVersion = 29
-        minSdkVersion = 18
-    }
-    ext.detoxKotlinVersion = ext.kotlinVersion
+    def kotlinVersion = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["RNBGU_kotlinVersion"]
+    ext.detoxKotlinVersion = kotlinVersion
 
     repositories {
-        mavenCentral()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath "com.android.tools.build:gradle:7.4.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
-def DEFAULT_TARGET_SDK_VERSION = 28
+def getExtOrDefault(name) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["RNBGU_" + name]
+}
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+def getExtOrIntegerDefault(name) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNBGU_" + name]).toInteger()
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+    compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 1
-        versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
+        minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+        targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     }
+
     lintOptions {
         abortOnError false
     }
 }
 
 repositories {
+    google()
     mavenCentral()
-}
 
-def _ext = ext
+    def found = false
+    def defaultDir = null
+    def androidSourcesName = "React Native sources"
 
-def _kotlinVersion = _ext.has('detoxKotlinVersion') ? _ext.detoxKotlinVersion : '1.3.10'
-def _kotlinStdlib = _ext.has('detoxKotlinStdlib') ? _ext.detoxKotlinStdlib : 'kotlin-stdlib-jdk8'
+    if (rootProject.ext.has("reactNativeAndroidRoot")) {
+        defaultDir = rootProject.ext.get("reactNativeAndroidRoot")
+    } else {
+        defaultDir = new File(
+                projectDir,
+                "/../../../node_modules/react-native/android"
+        )
+    }
 
-dependencies {
-    implementation "androidx.core:core-ktx:1.0.1"
+    if (defaultDir.exists()) {
+        maven {
+            url defaultDir.toString()
+            name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+        found = true
+    } else {
+        def parentDir = rootProject.projectDir
+
+        1.upto(5, {
+            if (found) return true
+            parentDir = parentDir.parentFile
 
-    implementation 'com.facebook.react:react-native:+'
+            def androidSourcesDir = new File(
+                    parentDir,
+                    "node_modules/react-native"
+            )
 
-    implementation "org.jetbrains.kotlin:$_kotlinStdlib:$_kotlinVersion"
+            def androidPrebuiltBinaryDir = new File(
+                    parentDir,
+                    "node_modules/react-native/android"
+            )
 
-    implementation 'net.gotev:uploadservice-okhttp:4.7.0'
+            if (androidPrebuiltBinaryDir.exists()) {
+                maven {
+                    url androidPrebuiltBinaryDir.toString()
+                    name androidSourcesName
+                }
 
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+                found = true
+            } else if (androidSourcesDir.exists()) {
+                maven {
+                    url androidSourcesDir.toString()
+                    name androidSourcesName
+                }
+
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+                found = true
+            }
+        })
+    }
+
+    if (!found) {
+        throw new GradleException(
+                "${project.name}: unable to locate React Native android sources. " +
+                        "Ensure you have you installed React Native as a dependency in your project and try again."
+        )
+    }
 }
+
+def kotlinVersion = getExtOrDefault("kotlinVersion")
+
+dependencies {
+    implementation "androidx.core:core-ktx:1.12.0"
+
+    implementation "com.facebook.react:react-native:+"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+    implementation 'net.gotev:uploadservice-okhttp:4.9.2'
+
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+}

android/gradle.properties

@@ -0,0 +1,8 @@
+RNBGU_kotlinVersion=1.9.10
+RNBGU_minSdkVersion=21
+RNBGU_targetSdkVersion=31
+RNBGU_compileSdkVersion=31
+RNBGU_buildToolsVersion=30.0.2
+RNBGU_playServicesVersion=18.1.0
+
+android.useAndroidX=true

package.json

@@ -23,7 +23,7 @@
   ],
   "peerDependencies": {
     "react": "*",
-    "react-native": ">=0.47.0"
+    "react-native": ">=0.64.0"
   },
   "author": "Steve Potter",
   "license": "BSD-3-Clause",
@@ -42,6 +42,7 @@
     "eslint": "^6.8.0",
     "husky": "^4.2.3",
     "lint-staged": "^10.0.8",
+    "react-native": "0.64",
     "semantic-release": "^15.13.31"
   },
   "release": {