浏览代码

Reverted Watermelon Android Changes

fsavio-lab 1 年之前
父节点
当前提交
ba1761891c
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 2 2
      android/app/build.gradle
  2. 4 4
      android/app/src/main/java/com/navmelon/MainApplication.java
  3. 2 2
      android/build.gradle

+ 2 - 2
android/app/build.gradle

@@ -156,8 +156,8 @@ dependencies {
     implementation("com.facebook.react:react-android")
 
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
-    implementation project(':watermelondb')
-    implementation project(':watermelondb-jsi')
+    // implementation project(':watermelondb')
+    // implementation project(':watermelondb-jsi')
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.squareup.okhttp3', module:'okhttp'

+ 4 - 4
android/app/src/main/java/com/navmelon/MainApplication.java

@@ -9,8 +9,8 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.soloader.SoLoader;
 import java.util.List;
-import com.nozbe.watermelondb.jsi.WatermelonDBJSIPackage;
-import com.nozbe.watermelondb.WatermelonDBPackage; // ⬅️ This!
+// import com.nozbe.watermelondb.jsi.WatermelonDBJSIPackage;
+// import com.nozbe.watermelondb.WatermelonDBPackage; // ⬅️ This!
 import com.facebook.react.bridge.JSIModulePackage; // ⬅️ This!
 
 public class MainApplication extends Application implements ReactApplication {
@@ -28,8 +28,8 @@ public class MainApplication extends Application implements ReactApplication {
           List<ReactPackage> packages = new PackageList(this).getPackages();
           // Packages that cannot be autolinked yet can be added manually here, for example:
           // packages.add(new MyReactNativePackage());
-          packages.add(new WatermelonDBJSIPackage())
-          packages.add(new WatermelonDBPackage())
+          // packages.add(new WatermelonDBJSIPackage())
+          // packages.add(new WatermelonDBPackage())
           return packages;
         }
 

+ 2 - 2
android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         minSdkVersion = 21
         compileSdkVersion = 33
         targetSdkVersion = 33
-        kotlinVersion = '1.5.20'
+        kotlinVersion = '1.7.20'
 
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
@@ -18,6 +18,6 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:7.3.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 
+        // classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" 
     }
 }