mapp-intelligence-reactnative-plugin 1.0.3 → 1.1.1

package/android/build.gradle

@@ -1,82 +1,42 @@
-import com.android.Version
-
 buildscript {
+  ext.getExtOrDefault = {name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['MappinteligencePlugin_' + name]
+  }
+
   repositories {
-    flatDir {
-      dirs 'libs'
-    }
     google()
     mavenCentral()
-    maven {
-      // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-      url "$rootDir/../node_modules/react-native/android"
-    }
   }
 
   dependencies {
-    classpath("com.android.tools.build:gradle:8.3.2")
+    classpath "com.android.tools.build:gradle:8.10.1"
+    classpath("com.facebook.react:react-native-gradle-plugin")
     // noinspection DifferentKotlinGradleVersion
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
-  }
-}
-
-allprojects {
-  repositories {
-    google()
-    mavenLocal()
-    mavenCentral()
-    maven { url "https://maven.google.com/" }
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
-// Buildscript is evaluated before everything else so we can't use getExtOrDefault
-def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["MappinteligencePlugin_kotlinVersion"]
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["MappinteligencePlugin_" + name]
+plugins {
+  id("com.android.library")
+  id("org.jetbrains.kotlin.android")
+  id("com.facebook.react") // This is required for New Architecture & Codegen
 }
 
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["MappinteligencePlugin_" + name]).toInteger()
 }
 
-static def supportsNamespace() {
-  def parsed = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  def major = parsed[0].toInteger()
-  def minor = parsed[1].toInteger()
-
-  // Namespace support was added in 7.3.0
-  return (major == 7 && minor >= 3) || major >= 8
-}
-
 android {
-  if (supportsNamespace()) {
-    namespace "com.mappinteligenceplugin"
-
-    sourceSets {
-      main {
-        manifest.srcFile "src/main/AndroidManifestNew.xml"
-      }
-    }
-  }
-
+  namespace "com.mappinteligenceplugin"
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+  }
 
+  buildFeatures {
+    buildConfig true
   }
 
   buildTypes {
@@ -90,8 +50,26 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+    }
+  }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+    }
   }
 }
 
@@ -100,19 +78,24 @@ repositories {
   google()
 }
 
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
-  implementation('com.facebook.react:react-native:0.20.1')
-  implementation("androidx.annotation:annotation:1.8.2")
-  implementation("androidx.core:core-ktx:1.13.1")
+  implementation "com.facebook.react:react-android:0.83.1"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
+  implementation("androidx.annotation:annotation:1.9.1")
+  implementation("androidx.core:core-ktx:1.16.0")
   implementation("androidx.appcompat:appcompat:1.7.0")
-  implementation("com.mapp.sdk:intelligence-android:5.1.11")
+  implementation("com.mapp.sdk:intelligence-android:5.1.13")
 }
 
-configurations.configureEach {
-  exclude(group: "com.android.support", module :"support-v4")
+react {
+  jsRootDir = rootDir
+  libraryName = "MappinteligencePlugin"
+  codegenJavaPackageName = "com.mappinteligenceplugin"
 }
+

package/android/gradle.properties

@@ -1,6 +1,7 @@
-MappinteligencePlugin_kotlinVersion=1.9.24
-MappinteligencePlugin_minSdkVersion=23
-MappinteligencePlugin_targetSdkVersion=34
-MappinteligencePlugin_compileSdkVersion=34
-MappinteligencePlugin_ndkversion=26.1.10909125
-android.useAndroidX=true
+MappinteligencePlugin_kotlinVersion=2.3.0
+MappinteligencePlugin_minSdkVersion=24
+MappinteligencePlugin_targetSdkVersion=36
+MappinteligencePlugin_compileSdkVersion=36
+MappinteligencePlugin_ndkversion=27.1.12297006
+android.useAndroidX=true
+newArchEnabled=true

package/android/settings.gradle

@@ -0,0 +1,24 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id("com.android.library") version("8.10.1") // 👈 for library
+        id("com.facebook.react") version("0.79.2")  // 👈 for React Native
+        id("org.jetbrains.kotlin.android") version("2.1.21") // 👈 for Kotlin
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenLocal()
+        mavenCentral()
+    }
+}
+includeBuild("../node_modules/@react-native/gradle-plugin")
+
+rootProject.name="MappinteligencePlugin"
+include(":MappinteligencePlugin")

package/android/specs/MappinteligencePluginSpec.js

@@ -0,0 +1,8 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  exampleMethod(param: string): void;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('MappinteligencePlugin');

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mappinteligenceplugin">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mappinteligenceplugin">
 </manifest>