@castleio/react-native-castle 2.1.1 → 2.2.0

package/android/.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>

package/android/.idea/gradle.xml

@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/usr/local/Cellar/gradle/7.3.3/libexec" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
@@ -12,7 +13,6 @@
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

package/android/.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

package/android/.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

package/android/build.gradle

@@ -9,14 +9,14 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.2'
+    classpath 'com.android.tools.build:gradle:8.2.2'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['Castle_' + name]
@@ -27,10 +27,11 @@ def getExtOrIntegerDefault(name) {
 }
 
 android {
+  namespace = "com.reactnativecastle"
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
-    minSdkVersion 21
+    minSdkVersion 24
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
   }
 
@@ -119,11 +120,22 @@ repositories {
   }
 }
 
+subprojects {
+    configurations.all {
+        resolutionStrategy.eachDependency {
+            if (requested.group == "org.jetbrains.kotlin") {
+                useVersion("$kotlin_version")
+                because("Align all Kotlin versions to avoid metadata issues")
+            }
+        }
+    }
+}
+
 def kotlin_version = getExtOrDefault('kotlinVersion')
 
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  api 'io.castle.android:castle:3.0.8'
+  api 'io.castle.android:castle:3.1.0'
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/gradle.properties

@@ -1,5 +1,5 @@
-Castle_kotlinVersion=1.9.21
+Castle_kotlinVersion=2.1.20
 Castle_compileSdkVersion=34
-Castle_buildToolsVersion=30.0.3
-Castle_targetSdkVersion=34
+Castle_buildToolsVersion=35.0.0
+Castle_targetSdkVersion=35
 android.useAndroidX=true

package/android/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

package/android/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

package/android/src/main/java/com/reactnativecastle/CastleModule.kt

@@ -43,6 +43,9 @@ class CastleModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
               builder.baseURLAllowList(baseURLAllowList)
             }
         }
+        if (options.hasKey("lifeCycleEventsEnabled")) {
+            builder.applicationLifecycleTrackingEnabled(options.getBoolean("lifeCycleEventsEnabled"))
+        }
 
         Castle.configure(reactApplicationContext.applicationContext as Application, builder.build())
 

package/ios/RCTCastle.m

@@ -29,7 +29,7 @@ RCT_EXPORT_METHOD(requestTokenHeaderName
 
 /**
  Configure Castle using the provided configuration
- 
+
  @param configuration CastleConfiguration instance
  */
 RCT_EXPORT_METHOD(configure:(nonnull NSDictionary *)options
@@ -44,31 +44,35 @@ RCT_EXPORT_METHOD(configure:(nonnull NSDictionary *)options
     [configuration setAdSupportBlock:^NSString* {
         return self.idfa;
     }];
-    
+
     if (options[@"debugLoggingEnabled"]) {
         configuration.debugLoggingEnabled = [options[@"debugLoggingEnabled"] boolValue];
     }
-    
+
     if (options[@"maxQueueLimit"]) {
         configuration.maxQueueLimit = [options[@"maxQueueLimit"] integerValue];
     }
-    
+
     if (options[@"flushLimit"]) {
         configuration.flushLimit = [options[@"flushLimit"] integerValue];
     }
-    
+
     if (options[@"baseURLAllowList"]) {
         configuration.baseURLAllowList = options[@"baseURLAllowList"];
     }
-    
+
+    if (options[@"lifeCycleEventsEnabled"]) {
+        configuration.enableApplicationLifecycleTracking = options[@"lifeCycleEventsEnabled"];
+    }
+
     [Castle configure:configuration];
-    
+
     return resolver(nil);
 }
 
 /**
  Configure Castle with default configuration using publishable key
- 
+
  @param publishableKey Castle publishable key
  */
 RCT_EXPORT_METHOD(configureWithPublishableKey:(nonnull NSString *)publishableKey
@@ -80,9 +84,9 @@ RCT_EXPORT_METHOD(configureWithPublishableKey:(nonnull NSString *)publishableKey
     CastleConfiguration *configuration = [CastleConfiguration configurationWithPublishableKey:publishableKey];
     configuration.screenTrackingEnabled = NO;
     configuration.deviceIDAutoForwardingEnabled = NO;
-    
+
     [Castle configureWithPublishableKey:publishableKey];
-    
+
     return resolver(nil);
 }
 
@@ -102,7 +106,7 @@ RCT_EXPORT_METHOD(resetConfiguration
 
 /**
  Set user jwt, will be persisted. A call to userJwt or reset will clear the stored user identity.
- 
+
  @param userJwt user jwt
  */
 RCT_EXPORT_METHOD(userJwt:(NSString *)userJwt)
@@ -112,7 +116,7 @@ RCT_EXPORT_METHOD(userJwt:(NSString *)userJwt)
 
 /**
  Track custom event with a specified name
- 
+
  @param name Event name
  */
 RCT_EXPORT_METHOD(custom:(NSString *)name)
@@ -122,7 +126,7 @@ RCT_EXPORT_METHOD(custom:(NSString *)name)
 
 /**
  Track custom event with a specified name and properties
- 
+
  @param name Event name
  @param properties Properties
  */
@@ -133,7 +137,7 @@ RCT_EXPORT_METHOD(customWithProperties:(NSString *)name properties:(NSDictionary
 
 /**
  Track screen event with a specified name
- 
+
  @param screenName Screen name
  */
 RCT_EXPORT_METHOD(screen:(NSString *)screenName)
@@ -151,7 +155,7 @@ RCT_EXPORT_METHOD(flush)
 
 /**
  Force a flush if needed for a specific url, flushes if url is whitelisted
- 
+
  @param url Whitelist url
  */
 RCT_EXPORT_METHOD(flushIfNeeded:(NSURL *)url)
@@ -169,7 +173,7 @@ RCT_EXPORT_METHOD(reset)
 
 /**
  Get base url
- 
+
  @return return Base URL
  */
 RCT_EXPORT_METHOD(baseUrl
@@ -182,7 +186,7 @@ RCT_EXPORT_METHOD(baseUrl
 
 /**
  Set advertising identifier (IDFA)
- 
+
  @param baseUrl Base URL
  */
 RCT_EXPORT_METHOD(setAdvertisingIdentifier:(NSString *)identifier)
@@ -194,7 +198,7 @@ RCT_EXPORT_METHOD(setAdvertisingIdentifier:(NSString *)identifier)
 
 /**
  Create request token
- 
+
  @return request token
  */
 RCT_EXPORT_METHOD(createRequestToken
@@ -208,7 +212,7 @@ RCT_EXPORT_METHOD(createRequestToken
 /**
  Get the User Agent for used in all requests to the Castle API.
  User agent will have the following format: App Name/x.x (xxxx) (iPhone XR; iOS xx.x; Castle x.x.x)
- 
+
  @return User Agent
  */
 RCT_EXPORT_METHOD(userAgent
@@ -221,7 +225,7 @@ RCT_EXPORT_METHOD(userAgent
 
 /**
  Get the current size of the event queue
- 
+
  @return return The current size of the event queue
  */
 RCT_EXPORT_METHOD(queueSize

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","Castle","NativeModules","exports","Error","_default","default"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAsCO,MAAM;EAAEC;AAAO,CAAC,GAAGC,0BAAa;AAACC,OAAA,CAAAF,MAAA,GAAAA,MAAA;AAExC,IAAI,CAACA,MAAM,EAAE;EACX,MAAM,IAAIG,KAAK,CAAC,sCAAsC,CAAC;AACzD;AAAC,IAAAC,QAAA,GAAAF,OAAA,CAAAG,OAAA,GAEcL,MAAM","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","Castle","NativeModules","exports","Error","_default","default"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAuCO,MAAM;EAAEC;AAAO,CAAC,GAAGC,0BAAa;AAACC,OAAA,CAAAF,MAAA,GAAAA,MAAA;AAExC,IAAI,CAACA,MAAM,EAAE;EACX,MAAM,IAAIG,KAAK,CAAC,sCAAsC,CAAC;AACzD;AAAC,IAAAC,QAAA,GAAAF,OAAA,CAAAG,OAAA,GAEcL,MAAM","ignoreList":[]}

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Castle","Error"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,aAAa,QAAQ,cAAc;AAsC5C,OAAO,MAAM;EAAEC;AAAO,CAAC,GAAGD,aAAa;AAEvC,IAAI,CAACC,MAAM,EAAE;EACX,MAAM,IAAIC,KAAK,CAAC,sCAAsC,CAAC;AACzD;AAEA,eAAeD,MAAM","ignoreList":[]}
+{"version":3,"names":["NativeModules","Castle","Error"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,aAAa,QAAQ,cAAc;AAuC5C,OAAO,MAAM;EAAEC;AAAO,CAAC,GAAGD,aAAa;AAEvC,IAAI,CAACC,MAAM,EAAE;EACX,MAAM,IAAIC,KAAK,CAAC,sCAAsC,CAAC;AACzD;AAEA,eAAeD,MAAM","ignoreList":[]}

package/lib/typescript/index.d.ts

@@ -7,6 +7,7 @@ export interface Configuration {
     apiDomain?: string;
     apiPath?: string;
     baseURLAllowList?: string[];
+    lifeCycleEventsEnabled?: boolean;
 }
 export type JsonValue = boolean | number | string | null | JsonList | JsonMap;
 export interface JsonMap {

package/lib/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,QAAQ,GAAG,OAAO,CAAC;AAC9E,MAAM,WAAW,OAAO;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AACD,MAAM,WAAW,QAAS,SAAQ,KAAK,CAAC,SAAS,CAAC;CAAG;AAErD,KAAK,UAAU,GAAG;IAChB,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,2BAA2B,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAQ,MAAM,KAAkB,CAAC;wBAMf,UAAU;AAAnC,wBAAoC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,QAAQ,GAAG,OAAO,CAAC;AAC9E,MAAM,WAAW,OAAO;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AACD,MAAM,WAAW,QAAS,SAAQ,KAAK,CAAC,SAAS,CAAC;CAAG;AAErD,KAAK,UAAU,GAAG;IAChB,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,2BAA2B,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAQ,MAAM,KAAkB,CAAC;wBAMf,UAAU;AAAnC,wBAAoC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@castleio/react-native-castle",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Castle SDK for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -50,9 +50,9 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^11.0.0",
-    "@react-native-community/eslint-config": "^3.2.0",
+    "@react-native/eslint-config": "^0.77.0",
     "@release-it/conventional-changelog": "^10.0.0",
-    "@types/jest": "^26.0.0",
+    "@types/jest": "^29.5.13",
     "@types/react": "^18.2.6",
     "@types/react-native": "^0.70.7",
     "commitlint": "^17.0.0",
@@ -60,12 +60,12 @@
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-prettier": "^3.4.1",
     "husky": "^4.2.5",
-    "jest": "^29.6.3",
-    "metro-react-native-babel-preset": "^0.67.0",
+    "jest": "^29.2.1",
+    "@react-native/babel-preset": "^0.77.0",
     "pod-install": "^0.1.0",
     "prettier": "^2.8.0",
     "react": "^18.3.1",
-    "react-native": "^0.75.0",
+    "react-native": "^0.77.0",
     "react-native-builder-bob": "^0.35.2",
     "release-it": "^18.1.2",
     "typescript": "^5.0.4"
@@ -105,7 +105,10 @@
   "eslintConfig": {
     "root": true,
     "extends": [
-      "@react-native-community",
+      "@react-native",
+      "prettier"
+    ],
+    "plugins": [
       "prettier"
     ],
     "rules": {

package/react-native-castle.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "Castle", "3.0.13"
+  s.dependency "Castle", "3.1.0"
 end

package/src/index.tsx

@@ -9,6 +9,7 @@ export interface Configuration {
   apiDomain?: string;
   apiPath?: string;
   baseURLAllowList?: string[];
+  lifeCycleEventsEnabled?: boolean;
 }
 
 export type JsonValue = boolean | number | string | null | JsonList | JsonMap;