@amplitude/analytics-react-native 1.3.6 → 1.4.1

package/README.md

@@ -7,7 +7,7 @@
 
 # @amplitude/analytics-react-native
 
-Official Amplitude SDK for React Native (Beta)
+Official Amplitude SDK for React Native
 
 # Installation and Quick Start
 

package/android/build.gradle

@@ -1,59 +1,108 @@
 buildscript {
-    ext.kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : "1.5.30"
-    repositories {
-        google()
-        jcenter()
-    }
+  // 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["AmplitudeReactNative_kotlinVersion"]
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
+}
+
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+
+def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["AmplitudeReactNative_" + 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["AmplitudeReactNative_" + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 29)
-    buildToolsVersion safeExtGet('buildToolsVersion', '29.0.2')
-    defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 29)
-        versionCode 1
-        versionName "1.0"
+  if (supportsNamespace()) {
+    namespace "com.amplitude.reactnative"
 
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
 }
 
 repositories {
-    mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    google()
-    jcenter()
+  mavenCentral()
+  google()
 }
 
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
 dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+  // 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:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "AmplitudeReactNative"
+    codegenJavaPackageName = "com.amplitude.reactnative"
+  }
 }

package/android/gradle.properties

@@ -1,3 +1,5 @@
-android.useAndroidX=true
-android.enableJetifier=true
-kotlin.code.style=official
+AmplitudeReactNative_kotlinVersion=1.7.0
+AmplitudeReactNative_minSdkVersion=21
+AmplitudeReactNative_targetSdkVersion=31
+AmplitudeReactNative_compileSdkVersion=31
+AmplitudeReactNative_ndkversion=21.4.7075529

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/ios/AmplitudeReactNative.swift

@@ -17,7 +17,8 @@ class ReactNative: NSObject {
     ) -> Void {
         let trackingOptions = options as! [String: Bool]
         let trackIdfv = trackingOptions["idfv"] ?? false
-        let appleContextProvider = AppleContextProvider(trackIdfv: trackIdfv)
+        let trackCarrier = trackingOptions["carrier"] ?? false
+        let appleContextProvider = AppleContextProvider(trackIdfv: trackIdfv, trackCarrier: trackCarrier)
 
         var applicationContext: [String: String?] = [
             "version": appleContextProvider.version,
@@ -31,6 +32,9 @@ class ReactNative: NSObject {
         if (trackIdfv) {
             applicationContext["idfv"] = appleContextProvider.idfv
         }
+        if (trackCarrier) {
+            applicationContext["carrier"] = appleContextProvider.carrier
+        }
         resolve(applicationContext)
     }
 

package/ios/AppleContextProvider.swift

@@ -1,3 +1,6 @@
+#if os(iOS) && !targetEnvironment(simulator)
+import CoreTelephony
+#endif
 import Foundation
 
 @objc public class AppleContextProvider : NSObject {
@@ -10,12 +13,16 @@ import Foundation
     public let deviceManufacturer: String = AppleContextProvider.getDeviceManufacturer()
     public let deviceModel: String = AppleContextProvider.getDeviceModel()
     public var idfv: String? = nil
+    public var carrier: String? = nil
 
-    init(trackIdfv: Bool) {
+    init(trackIdfv: Bool, trackCarrier: Bool) {
       super.init()
       if (trackIdfv) {
         fetchIdfv()
       }
+      if (trackCarrier) {
+        fetchCarrier()
+      }
     }
 
     private static func getVersion() -> String? {
@@ -53,6 +60,22 @@ import Foundation
         self.idfv = UIDevice.current.identifierForVendor?.uuidString
     }
 
+    private func fetchCarrier() {
+        self.carrier = "Unknown"
+        #if os(iOS) && !targetEnvironment(simulator)
+        if #available(iOS 12.0, *) {
+            let networkInfo = CTTelephonyNetworkInfo()
+            if let providers = networkInfo.serviceSubscriberCellularProviders {
+                for (_, provider) in providers where provider.mobileNetworkCode != nil {
+                    self.carrier = provider.carrierName ?? carrier
+                    // As long as we get one carrier information, we break.
+                    break
+                }
+            }
+        }
+        #endif
+    }
+
     private static func getDeviceModel() -> String {
         let platform = getPlatformString()
         // == iPhone ==

package/lib/commonjs/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VERSION = void 0;
-const VERSION = '1.3.6';
+const VERSION = '1.4.1';
 exports.VERSION = VERSION;
 //# sourceMappingURL=version.js.map

package/lib/module/version.js

@@ -1,2 +1,2 @@
-export const VERSION = '1.3.6';
+export const VERSION = '1.4.1';
 //# sourceMappingURL=version.js.map

package/lib/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "1.3.6";
+export declare const VERSION = "1.4.1";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amplitude/analytics-react-native",
-  "version": "1.3.6",
+  "version": "1.4.1",
   "description": "Official React Native SDK",
   "keywords": [
     "analytics",
@@ -90,5 +90,5 @@
       ]
     ]
   },
-  "gitHead": "83cf780dec45f8e8dfcc7310c70ffb4ffe67788e"
+  "gitHead": "348b1ecbc418e6bb0d74fd57cb93cf7c2d69006b"
 }

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '1.3.6';
+export const VERSION = '1.4.1';