Release 6.0.0 (#236)

* [MOBILE-1044] update ios to SDK 13.0.1

* [MOBILE-1044] use location provider

* [MOBILE-1044] add mc extension to native bridge

* [MOBILE-1044] comments, update signatures for both platforms

* [MOBILE-1044] update typescript interface

* [MOBILE-1131] add module version tracking to ios and android (#234)

* [MOBILE-1131] track module version ios

* [MOBILE-1131] track module version android

* Release 6.0.0

* bump ios to 13.0.3

* pod install

* update changelog

* changelog

* update imports and refactor versionString to moduleVersionString

* bump example deploy target version

* update changelog and ios-sdk dependency to 13.0.4

* comment

* nye

* comments

Author: crow

CHANGELOG.md

@@ -1,4 +1,17 @@
 
+Version 6.0.0 - December 31, 2019
+=================================
+Major release to update iOS to modularized SDK 13.0.4, update Android SDK to 12.1.0,
+add cross-platform attribute support and modernize the Message Center Javascript
+and Typescript interfaces.
+
+Changes
+-------
+- Updated iOS SDK to 13.0.4
+- Updated Android SDK to 12.1.0
+- Added attributes support
+- Updated Message Center interfaces to reflect the removal of overlay Message Center views
+
 Version 5.0.1 - December 9, 2019
 ================================
 Patch release to fix a bug affecting loss of tags on iOS during app

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010-2019 Airship and Contributors
+Copyright 2010-2020 Airship and Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

README.md

@@ -1,19 +1,19 @@
-# Urban Airship React Native
+# Airship React Native
 
-A React Native module for Urban Airship's iOS and Android SDK.
+A React Native module for Airship's iOS and Android SDK.
 
 ### Resources
 
-* [Getting started guide](http://docs.urbanairship.com/platform/react-native/)
-* [API docs](http://docs.urbanairship.com/reference/libraries/react-native/latest/index.html)
+* [Getting started guide](http://docs.airship.com/platform/react-native/)
+* [API docs](http://docs.airship.com/reference/libraries/react-native/latest/index.html)
 
 ### Issues
 
-Please visit https://support.urbanairship.com/ for any issues integrating or using this module.
+Please visit https://support.airship.com/ for any issues integrating or using this module.
 
 ### Requirements:
- - Xcode 10+
- - iOS: Deployment target 10.0+
+ - Xcode 11+
+ - iOS: Deployment target 11.0+
  - Android: minSdkVersion 16+, compileSdkVersion 28+
  - React Native >= 0.60.0
  - React Native cli >= 2.0.1
@@ -59,7 +59,7 @@ cd ios && pod install
 
 4) Optional. In order to take advantage of iOS 10 notification attachments,
 such as images, animated gifs, and video, you will need to create a notification
-service extension by following the [iOS Notification Service Extension Guide](https://docs.urbanairship.com/platform/reference/ios-extension/)
+service extension by following the [iOS Notification Service Extension Guide](https://docs.airship.com/platform/reference/ios-extension/)
 
 ## Android Setup
 

UrbanAirship-React-Native-Module.podspec

@@ -1,6 +1,7 @@
 require "json"
 
  package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+ sync_version = `#{__dir__}/scripts/sync_version.sh #{package["version"]}`
 
  Pod::Spec.new do |s|
   s.name         = "UrbanAirship-React-Native-Module"
@@ -9,9 +10,10 @@ require "json"
   s.author       = package['author']
   s.homepage     = package['homepage']
   s.license      = package['license']
-  s.platform     = :ios, "10.0"
+  s.platform     = :ios, "11.0"
   s.source       = { :git => "https://github.com/urbanairship/react-native-module.git", :tag => "{s.version}" }
   s.source_files  = "ios/**/*.{h,m}"
   s.dependency "React"
-  s.dependency "Airship", "13.0.1"
+  s.dependency "Airship", "13.0.4"
+
 end

android/build.gradle

@@ -1,21 +1,32 @@
 apply plugin: 'com.android.library'
 
+import groovy.json.JsonSlurper
+
 android {
     compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
+
+        buildConfigField("String", "MODULE_VERSION", "\"${getModuleVersion()}\"")
     }
 }
 
+def getModuleVersion() {
+    def jsonFile = file('../package.json')
+    def parsedJson = new JsonSlurper().parseText(jsonFile.text)
+
+    return parsedJson["version"]
+}
+
 def safeExtGet (prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation ('com.urbanairship.android:urbanairship-fcm:12.0.0') {
+    implementation ('com.urbanairship.android:urbanairship-fcm:12.1.0') {
       exclude group: 'com.google.firebase', module: 'firebase-messaging'
     }
     implementation "com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '20.1.0')}"

android/src/main/java/com/urbanairship/reactnative/ReactAutopilot.java

@@ -12,6 +12,7 @@
 import com.urbanairship.Logger;
 import com.urbanairship.UAirship;
 import com.urbanairship.actions.DeepLinkListener;
+import com.urbanairship.analytics.Analytics;
 import com.urbanairship.messagecenter.MessageCenter;
 import com.urbanairship.push.NotificationActionButtonInfo;
 import com.urbanairship.push.NotificationInfo;
@@ -27,6 +28,7 @@
 import com.urbanairship.reactnative.events.ShowInboxEvent;
 import com.urbanairship.richpush.RichPushInbox;
 
+import static com.urbanairship.reactnative.BuildConfig.MODULE_VERSION;
 import static com.urbanairship.reactnative.UrbanAirshipReactModule.AUTO_LAUNCH_MESSAGE_CENTER;
 
 /**
@@ -112,7 +114,7 @@ public void onNotificationBackgroundAction(@NonNull NotificationInfo notificatio
             @Override
             public void onNotificationDismissed(@NonNull NotificationInfo notificationInfo) {}
         });
-        
+
         // Register a listener for inbox update event
         airship.getInbox().addListener(new RichPushInbox.Listener() {
             @Override
@@ -138,6 +140,8 @@ public boolean onShowMessageCenter(@Nullable String messageId) {
         ReactNotificationProvider notificationProvider = new ReactNotificationProvider(context, airship.getAirshipConfigOptions());
         airship.getPushManager().setNotificationProvider(notificationProvider);
 
+        airship.shared().getAnalytics().registerSDKExtension(Analytics.EXTENSION_REACT_NATIVE, MODULE_VERSION);
+
         loadCustomNotificationChannels(context, airship);
         loadCustomNotificationButtonGroups(context, airship);
     }

android/src/main/java/com/urbanairship/reactnative/UrbanAirshipReactModule.java

@@ -3,7 +3,6 @@
 package com.urbanairship.reactnative;
 
 import android.Manifest;
-import android.app.Activity;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +37,7 @@
 import com.urbanairship.actions.ActionCompletionCallback;
 import com.urbanairship.actions.ActionResult;
 import com.urbanairship.actions.ActionRunRequest;
+import com.urbanairship.analytics.Analytics;
 import com.urbanairship.analytics.AssociatedIdentifiers;
 import com.urbanairship.messagecenter.MessageCenter;
 import com.urbanairship.push.PushMessage;
@@ -105,7 +105,6 @@ public UrbanAirshipReactModule(ReactApplicationContext reactContext) {
     public void initialize() {
         super.initialize();
 
-
         getReactApplicationContext().addLifecycleEventListener(new LifecycleEventListener() {
             @Override
             public void onHostResume() {

example/ios/AirshipSample.xcodeproj/project.pbxproj

@@ -339,6 +339,9 @@
 				"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
 				"${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
 				"${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework",
+				"${BUILT_PRODUCTS_DIR}/RNGestureHandler/RNGestureHandler.framework",
+				"${BUILT_PRODUCTS_DIR}/RNReanimated/RNReanimated.framework",
+				"${BUILT_PRODUCTS_DIR}/RNScreens/RNScreens.framework",
 				"${BUILT_PRODUCTS_DIR}/React-Core/React.framework",
 				"${BUILT_PRODUCTS_DIR}/React-CoreModules/CoreModules.framework",
 				"${BUILT_PRODUCTS_DIR}/React-RCTActionSheet/RCTActionSheet.framework",
@@ -358,7 +361,7 @@
 				"${BUILT_PRODUCTS_DIR}/UrbanAirship-React-Native-Module/UrbanAirship_React_Native_Module.framework",
 				"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
 				"${BUILT_PRODUCTS_DIR}/glog/glog.framework",
-				"${BUILT_PRODUCTS_DIR}/UrbanAirship-iOS-AppExtensions/AirshipAppExtensions.framework",
+				"${BUILT_PRODUCTS_DIR}/AirshipExtensions/AirshipExtensions.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -367,6 +370,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNGestureHandler.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNReanimated.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNScreens.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CoreModules.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTActionSheet.framework",
@@ -386,7 +392,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UrbanAirship_React_Native_Module.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AirshipAppExtensions.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AirshipExtensions.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -465,6 +471,7 @@
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = PGJV57GD94;
 				INFOPLIST_FILE = AirshipSample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -486,6 +493,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = PGJV57GD94;
 				INFOPLIST_FILE = AirshipSample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -613,7 +621,7 @@
 				DEVELOPMENT_TEAM = PGJV57GD94;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ServiceExtension/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -641,7 +649,7 @@
 				DEVELOPMENT_TEAM = PGJV57GD94;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ServiceExtension/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.urbanairship.richpush.ServiceExtension;

example/ios/Podfile

@@ -38,5 +38,5 @@ end
 target 'ServiceExtension' do
   platform :ios, '11.0'
   # Pods for Service Extension
-  pod 'UrbanAirship-iOS-AppExtensions', '12.0.0'
+  pod 'AirshipExtensions/NotificationService'
 end