From bc954704fe660fcaf0a99f9d1a4e983d571d21a7 Mon Sep 17 00:00:00 2001 From: Ryan Lepinski Date: Wed, 3 Jul 2024 19:30:54 -0700 Subject: [PATCH] Release 19.0.0 --- CHANGELOG.md | 8 ++++ android/build.gradle | 2 +- android/gradle.properties | 15 +++---- .../reactnative/ReactAutopilot.kt | 4 +- example/android/build.gradle | 6 +-- example/ios/Podfile.lock | 44 +++++++++---------- ios/AirshipReactNative.swift | 2 +- package.json | 2 +- react-native-airship.podspec | 2 +- src/types.ts | 12 +++++ 10 files changed, 56 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 698f3450..a792a2c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # React Native Module Changelog +## Version 19.0.0 - July 5, 2024 +Major release that updates the Android Airship SDK to 18. + +### Changes +- Updated iOS SDK to 18.5.0 +- Updated Android SDK to 18.1.1 +- Added iOS logPrivacyLevel that can be set in the environments when calling takeOff + ## Version 18.0.4 - Jun 20, 2024 Patch release to fix a regression on iOS with In-App Automations, Scenes, and Surveys ignoring screen, version, and custom event triggers. Apps using those triggers that are on 18.0.4 should update. diff --git a/android/build.gradle b/android/build.gradle index 5eef89be..698c0580 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -153,7 +153,7 @@ dependencies { api "com.urbanairship.android:airship-framework-proxy:$proxy_version" if (isHmsEnabled()) { - implementation "com.urbanairship.android:urbanairship-hms:$airship_version" + implementation "com.urbanairship.android:airship-framework-proxy-hms:$proxy_version" } } diff --git a/android/gradle.properties b/android/gradle.properties index 019a94da..014cde68 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,11 +1,6 @@ -Airship_kotlinVersion=1.7.0 +Airship_kotlinVersion=1.9.24 Airship_minSdkVersion=21 -Airship_targetSdkVersion=31 -Airship_compileSdkVersion=31 -Airship_ndkversion=21.4.7075529 - -Airship_airshipProxyVersion=6.3.1 - -# workaround for now, used for HMS -Airship_airshipVersion=17.8.1 - +Airship_targetSdkVersion=34 +Airship_compileSdkVersion=34 +Airship_ndkversion=26.1.10909125 +Airship_airshipProxyVersion=7.0.0 \ No newline at end of file diff --git a/android/src/main/java/com/urbanairship/reactnative/ReactAutopilot.kt b/android/src/main/java/com/urbanairship/reactnative/ReactAutopilot.kt index e73c29f4..25b9f6ec 100644 --- a/android/src/main/java/com/urbanairship/reactnative/ReactAutopilot.kt +++ b/android/src/main/java/com/urbanairship/reactnative/ReactAutopilot.kt @@ -6,7 +6,7 @@ import android.content.Context import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import com.urbanairship.UAirship -import com.urbanairship.analytics.Analytics +import com.urbanairship.analytics.Extension import com.urbanairship.android.framework.proxy.BaseAutopilot import com.urbanairship.android.framework.proxy.ProxyLogger import com.urbanairship.android.framework.proxy.ProxyStore @@ -39,7 +39,7 @@ class ReactAutopilot : BaseAutopilot() { val notificationProvider = ReactNotificationProvider(context, airship.airshipConfigOptions) airship.pushManager.notificationProvider = notificationProvider - airship.analytics.registerSDKExtension(Analytics.EXTENSION_REACT_NATIVE, BuildConfig.AIRSHIP_MODULE_VERSION) + airship.analytics.registerSDKExtension(Extension.REACT_NATIVE, BuildConfig.AIRSHIP_MODULE_VERSION) val extender = createExtender(context) extender?.onAirshipReady(context, airship) diff --git a/example/android/build.gradle b/example/android/build.gradle index 406732d1..aa6ac0db 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -3,11 +3,11 @@ buildscript { ext { buildToolsVersion = "34.0.0" - minSdkVersion = 21 + minSdkVersion = 23 compileSdkVersion = 34 targetSdkVersion = 34 - ndkVersion = "25.1.8937393" - kotlinVersion = "1.8.0" + ndkVersion = "26.1.10909125" + kotlinVersion = "1.9.24" } repositories { google() diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index e7b33091..5de91d2c 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,25 +1,25 @@ PODS: - - Airship (18.4.1): - - Airship/Automation (= 18.4.1) - - Airship/Basement (= 18.4.1) - - Airship/Core (= 18.4.1) - - Airship/FeatureFlags (= 18.4.1) - - Airship/MessageCenter (= 18.4.1) - - Airship/PreferenceCenter (= 18.4.1) - - Airship/Automation (18.4.1): + - Airship (18.5.0): + - Airship/Automation (= 18.5.0) + - Airship/Basement (= 18.5.0) + - Airship/Core (= 18.5.0) + - Airship/FeatureFlags (= 18.5.0) + - Airship/MessageCenter (= 18.5.0) + - Airship/PreferenceCenter (= 18.5.0) + - Airship/Automation (18.5.0): - Airship/Core - - Airship/Basement (18.4.1) - - Airship/Core (18.4.1): + - Airship/Basement (18.5.0) + - Airship/Core (18.5.0): - Airship/Basement - - Airship/FeatureFlags (18.4.1): + - Airship/FeatureFlags (18.5.0): - Airship/Core - - Airship/MessageCenter (18.4.1): + - Airship/MessageCenter (18.5.0): - Airship/Core - - Airship/PreferenceCenter (18.4.1): + - Airship/PreferenceCenter (18.5.0): - Airship/Core - - AirshipFrameworkProxy (6.3.1): - - Airship (= 18.4.1) - - AirshipServiceExtension (18.2.2) + - AirshipFrameworkProxy (7.0.0): + - Airship (= 18.5.0) + - AirshipServiceExtension (18.5.0) - boost (1.83.0) - DoubleConversion (1.1.6) - FBLazyVector (0.73.4) @@ -907,8 +907,8 @@ PODS: - React-Mapbuffer (0.73.4): - glog - React-debug - - react-native-airship (18.0.5): - - AirshipFrameworkProxy (= 6.3.1) + - react-native-airship (19.0.0): + - AirshipFrameworkProxy (= 7.0.0) - glog - RCT-Folly (= 2022.05.16.00) - React-Core @@ -1279,9 +1279,9 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - Airship: 4c99ee58d4441c63ab9c058d5e800cdaa4b7f8d3 - AirshipFrameworkProxy: ca1ec42c20c95cd94b910cb674aed24333bee641 - AirshipServiceExtension: 1c42d463c21c4fa0ddc078e20e281c7b2c965b41 + Airship: d4f6f81bf746285112b266840c6a5057c1d50f13 + AirshipFrameworkProxy: f5644d0d564a6b63ae39c88aae016a869949be2c + AirshipServiceExtension: b3dc262db467632dac6bd2c9f5f30efb2a751fb2 boost: d3f49c53809116a5d38da093a8aa78bf551aed09 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7 @@ -1311,7 +1311,7 @@ SPEC CHECKSUMS: React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460 React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad - react-native-airship: 307283c2bde05274d8872f3c4d79fdfa03234586 + react-native-airship: 9818f07914c2e760f18a83bbd990e2d79299e3c8 react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac diff --git a/ios/AirshipReactNative.swift b/ios/AirshipReactNative.swift index 68eef678..a57d82b6 100644 --- a/ios/AirshipReactNative.swift +++ b/ios/AirshipReactNative.swift @@ -36,7 +36,7 @@ public class AirshipReactNative: NSObject { AirshipProxy.shared } - public static let version: String = "18.0.5" + public static let version: String = "19.0.0" private let eventNotifier = EventNotifier() diff --git a/package.json b/package.json index 1b92334a..61f8fcff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ua/react-native-airship", - "version": "18.0.5", + "version": "19.0.0", "description": "Airship plugin for React Native apps.", "main": "lib/commonjs/index", "module": "lib/module/index", diff --git a/react-native-airship.podspec b/react-native-airship.podspec index 48c29da0..3fbe2fdf 100644 --- a/react-native-airship.podspec +++ b/react-native-airship.podspec @@ -22,5 +22,5 @@ Pod::Spec.new do |s| s.dependency "React-Core" end - s.dependency "AirshipFrameworkProxy", "6.3.1" + s.dependency "AirshipFrameworkProxy", "7.0.0" end diff --git a/src/types.ts b/src/types.ts index 2f43b0b5..3c7f93b4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -363,6 +363,18 @@ export interface ConfigEnvironment { * Optional log level. */ logLevel?: LogLevel; + + /** + * Optional iOS config + */ + ios?: { + /** + * Log privacy level. By default it logs at `private`, not logging anything lower than info to the console + * and redacting logs with string interpolation. `public` will log all configured log levels to the console + * without redacting any of the log lines. + */ + logPrivacyLevel?: "private" | "public"; + } } /**