@norcy/react-native-toolkit 0.2.33 → 0.2.34

package/android/buildscript.gradle

@@ -1,9 +1,10 @@
 ext.applyBuildscriptExt = {
-    ext.buildToolsVersion = "29.0.3"
+    ext.buildToolsVersion = "33.0.0"
     ext.minSdkVersion = 21
     ext.compileSdkVersion = 33
     ext.targetSdkVersion = 33
-    ext.kotlinVersion = "1.6.0"
+    ext.ndkVersion = "23.1.7779620"
+    ext.kotlinVersion = "1.8.0"
 }
 
 ext.applyBuildscriptRepos = { handler ->
@@ -13,3 +14,9 @@ ext.applyBuildscriptRepos = { handler ->
     handler.google()
 }
 
+ext.applyBuildscriptDependencies = { handler ->
+    handler.classpath("com.android.tools.build:gradle")
+    handler.classpath("com.facebook.react:react-native-gradle-plugin")
+    handler.classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+}
+

package/android/dependencies.gradle

@@ -1,6 +1,7 @@
 ext.applyDefaultConfig = { targetProject ->
     targetProject.android {
         compileSdkVersion targetProject.rootProject.ext.compileSdkVersion
+        ndkVersion targetProject.rootProject.ext.ndkVersion
         
         defaultConfig {
             minSdkVersion targetProject.rootProject.ext.minSdkVersion
@@ -41,16 +42,15 @@ ext.applyDefaultConfig = { targetProject ->
 }
 
 ext.applyCommonDependencies = { targetProject ->
-    def enableHermes = targetProject.ext.react.get("enableHermes", false)
+    def enableHermes = targetProject.findProperty('hermesEnabled')?.toBoolean() ?: true
     def jscFlavor = 'org.webkit:android-jsc:+'
     
     targetProject.dependencies {
         implementation fileTree(dir: "libs", include: ["*.jar"])
         
-        //noinspection GradleDynamicVersion
-        implementation "com.facebook.react:react-native:0.62.2.9.1"
+        implementation "com.facebook.react:react-android"
         implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-        implementation 'com.android.support:multidex:2.0.1'
+        implementation 'androidx.multidex:multidex:2.0.1'
         
         implementation 'com.umeng.umsdk:common:9.6.3'
         implementation 'com.umeng.umsdk:asms:1.8.0'
@@ -60,9 +60,7 @@ ext.applyCommonDependencies = { targetProject ->
         implementation targetProject.project(':react-native-blob-util')
         
         if (enableHermes) {
-            def hermesPath = "../../node_modules/hermes-engine/android/"
-            debugImplementation files(hermesPath + "hermes-debug.aar")
-            releaseImplementation files(hermesPath + "hermes-release.aar")
+            implementation("com.facebook.react:hermes-android")
         } else {
             implementation jscFlavor
         }
@@ -90,8 +88,8 @@ ext.applyBuildTypes = { targetProject ->
 ext.applyCommonAndroidConfig = { targetProject ->
     targetProject.android {
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
+            sourceCompatibility JavaVersion.VERSION_11
+            targetCompatibility JavaVersion.VERSION_11
         }
         
         packagingOptions {
@@ -101,7 +99,7 @@ ext.applyCommonAndroidConfig = { targetProject ->
             pickFirst "lib/x86_64/libc++_shared.so"
         }
         
-        lintOptions {
+        lint {
             checkReleaseBuilds false
         }
         
@@ -116,11 +114,6 @@ ext.applyCommonAndroidConfig = { targetProject ->
             }
         }
     }
-    
-    targetProject.tasks.create('copyDownloadableDepsToLibs', Copy) {
-        from targetProject.configurations.compile
-        into 'libs'
-    }
 }
 
 ext.applyCommonPlugins = { targetProject ->
@@ -137,9 +130,6 @@ ext.applyCommonPlugins = { targetProject ->
 }
 
 ext.applyAll = { targetProject ->
-    targetProject.ext.react = [enableHermes: true]
-    targetProject.apply from: targetProject.file("../../node_modules/react-native/react.gradle")
-    
     applyDefaultConfig(targetProject)
     applyBuildTypes(targetProject)
     applyCommonAndroidConfig(targetProject)

package/android/root.gradle

@@ -1,5 +1,3 @@
-def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
-
 allprojects {
     repositories {
         maven { url 'https://raw.githubusercontent.com/Norcy/maven/master/repository/' }
@@ -15,20 +13,13 @@ allprojects {
         mavenCentral()
         google()
     }
-    
-    configurations.all {
-        resolutionStrategy {
-            force "com.facebook.react:react-native:" + '0.62.2.9.1'
-            force 'androidx.core:core-ktx:1.6.0'
-        }
-    }
-    
+
     afterEvaluate { project ->
         if (project.hasProperty("android")) {
             android {
                 compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_1_8
-                    targetCompatibility JavaVersion.VERSION_1_8
+                    sourceCompatibility JavaVersion.VERSION_11
+                    targetCompatibility JavaVersion.VERSION_11
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "private": false,
   "description": "My Toolkit",
   "main": "lib/commonjs/index",