@aguacerowx/react-native 0.0.17 → 0.0.19

package/android/build.gradle

@@ -1,84 +1,108 @@
-// @aguacerowx/react-native/android/build.gradle
-
-repositories {
-    google()
-    mavenCentral()
-    maven {
-        url 'https://api.mapbox.com/downloads/v2/releases/maven'
-        authentication {
-            basic(BasicAuthentication)
-        }
-        credentials {
-            username = "mapbox"
-            password = project.rootProject.findProperty("MAPBOX_DOWNLOADS_TOKEN") ?: System.getenv("MAPBOX_DOWNLOADS_TOKEN")
-        }
-    }
-}
-
-apply plugin: 'com.android.library'
-
-android {
-    namespace 'com.aguacerowx.reactnative'
-    compileSdk 34 
-
-    defaultConfig {
-        minSdk 23 
-        targetSdk 34
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    sourceSets {
-        main {
-            java.srcDirs += new File(projectDir, "../src/main/java/com/facebook/react/viewmanagers")
-        }
-    }
-}
-
-dependencies {
-    implementation 'com.facebook.react:react-native:+'
-    api 'org.locationtech.proj4j:proj4j:1.1.5'
-    implementation 'com.github.luben:zstd-jni:1.5.7-6@aar'
-}
-
-project.afterEvaluate {
-    // 1. Resolve the Mapbox Version
-    def resolvedMapboxVersion
-    if (project.rootProject.hasProperty('mapboxMapsVersion')) {
-        resolvedMapboxVersion = project.rootProject.mapboxMapsVersion
-        println "[aguacerowx] Found mapboxMapsVersion: ${resolvedMapboxVersion}"
-    } else {
-        resolvedMapboxVersion = "11.15.2" 
-        println "[aguacerowx] WARNING: Could not find 'mapboxMapsVersion' property. Falling back to ${resolvedMapboxVersion}."
-    }
-
-    // 2. Detect if @rnmapbox/maps is present in the user's project
-    // We check the root project to see all included modules.
-    def rnMapboxIsPresent = project.rootProject.findProject(':rnmapbox_maps') != null
-    def mapboxArtifact
-
-    // 3. Choose the correct Mapbox artifact based on the detection
-    if (rnMapboxIsPresent) {
-        // If @rnmapbox/maps is present, we MUST use the ndk27 variant to avoid conflicts.
-        mapboxArtifact = "android-ndk27"
-        println "[aguacerowx] @rnmapbox/maps detected. Using Mapbox artifact: '${mapboxArtifact}' to ensure compatibility."
-    } else {
-        // If it's not present, use the standard 'android' variant.
-        mapboxArtifact = "android"
-        println "[aguacerowx] @rnmapbox/maps not detected. Using standard Mapbox artifact: '${mapboxArtifact}'."
-    }
-
-    // 4. Add the chosen Mapbox dependency using the version and artifact we just determined.
-    dependencies {
-        implementation "com.mapbox.maps:${mapboxArtifact}:${resolvedMapboxVersion}"
-    }
+// @aguacerowx/react-native/android/build.gradle
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.facebook.react:react-native-gradle-plugin")
+    }
+}
+
+repositories {
+    google()
+    mavenCentral()
+    maven {
+        url 'https://api.mapbox.com/downloads/v2/releases/maven'
+        authentication {
+            basic(BasicAuthentication)
+        }
+        credentials {
+            username = "mapbox"
+            password = project.rootProject.findProperty("MAPBOX_DOWNLOADS_TOKEN") ?: System.getenv("MAPBOX_DOWNLOADS_TOKEN")
+        }
+    }
+}
+
+apply plugin: 'com.android.library'
+
+def isNewArchEnabled = project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+
+if (isNewArchEnabled) {
+    apply plugin: "com.facebook.react"
+}
+
+android {
+    namespace 'com.aguacerowx.reactnative'
+    compileSdk 34 
+
+    defaultConfig {
+        minSdk 23 
+        targetSdk 34
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        main {
+            java.srcDirs += new File(projectDir, "../src/main/java/com/facebook/react/viewmanagers")
+        }
+    }
+}
+
+if (isNewArchEnabled) {
+    react {
+        libraryName = "AguaceroWxReactNativeSpec"
+        codegenJavaPackageName = "com.aguacerowx.reactnative"
+    }
+}
+
+dependencies {
+    implementation 'com.facebook.react:react-native:+'
+    api 'org.locationtech.proj4j:proj4j:1.1.5'
+    implementation 'com.github.luben:zstd-jni:1.5.7-6@aar'
+}
+
+project.afterEvaluate {
+    // Fix Gradle 9 task dependency issue
+    if (isNewArchEnabled) {
+        tasks.named("generateCodegenArtifactsFromSchema").configure {
+            dependsOn("generateCodegenSchemaFromJavaScript")
+        }
+    }
+
+    // Mapbox version resolution
+    def resolvedMapboxVersion
+    if (project.rootProject.hasProperty('mapboxMapsVersion')) {
+        resolvedMapboxVersion = project.rootProject.mapboxMapsVersion
+        println "[aguacerowx] Found mapboxMapsVersion: ${resolvedMapboxVersion}"
+    } else {
+        resolvedMapboxVersion = "11.15.2" 
+        println "[aguacerowx] WARNING: Could not find 'mapboxMapsVersion' property. Falling back to ${resolvedMapboxVersion}."
+    }
+
+    def rnMapboxIsPresent = project.rootProject.findProject(':rnmapbox_maps') != null
+    def mapboxArtifact
+
+    if (rnMapboxIsPresent) {
+        mapboxArtifact = "android-ndk27"
+        println "[aguacerowx] @rnmapbox/maps detected. Using Mapbox artifact: '${mapboxArtifact}' to ensure compatibility."
+    } else {
+        mapboxArtifact = "android"
+        println "[aguacerowx] @rnmapbox/maps not detected. Using standard Mapbox artifact: '${mapboxArtifact}'."
+    }
+
+    dependencies {
+        implementation "com.mapbox.maps:${mapboxArtifact}:${resolvedMapboxVersion}"
+    }
 }

package/android/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aguacerowx.reactnative">
-    <!-- This manifest is for a library module. It requires very little. -->
-    <!-- The package name MUST exactly match the namespace in build.gradle -->
-    <!-- and the package declarations in your Java files. -->
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.aguacerowx.reactnative">
+    <!-- This manifest is for a library module. It requires very little. -->
+    <!-- The package name MUST exactly match the namespace in build.gradle -->
+    <!-- and the package declarations in your Java files. -->
 </manifest>

package/android/src/main/java/com/aguacerowx/reactnative/AguaceroPackage.java

@@ -1,34 +1,34 @@
-// packages/react-native/android/src/main/java/com/aguacerowx/reactnative/AguaceroPackage.java
-
-package com.aguacerowx.reactnative;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class AguaceroPackage implements ReactPackage {
-    
-    @NonNull
-    @Override
-    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new WeatherFrameProcessorModule(reactContext));
-        modules.add(new InspectorModule(reactContext));  // ADD THIS LINE
-        return modules;
-    }
-
-    @NonNull
-    @Override
-    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        List<ViewManager> managers = new ArrayList<>();
-        managers.add(new GridRenderManager());
-        return managers;
-    }
+// packages/react-native/android/src/main/java/com/aguacerowx/reactnative/AguaceroPackage.java
+
+package com.aguacerowx.reactnative;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class AguaceroPackage implements ReactPackage {
+    
+    @NonNull
+    @Override
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<>();
+        modules.add(new WeatherFrameProcessorModule(reactContext));
+        modules.add(new InspectorModule(reactContext));  // ADD THIS LINE
+        return modules;
+    }
+
+    @NonNull
+    @Override
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+        List<ViewManager> managers = new ArrayList<>();
+        managers.add(new GridRenderManager());
+        return managers;
+    }
 }