Release 8.0.0 (#56)

rlepinski · web-flow · commit 18bf09f2495a · 2020-09-29T15:48:41.000-07:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,18 +5,15 @@ on: [pull_request]
 jobs:
   build:
     runs-on: macos-latest
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions/setup-java@v1
         with:
           java-version: "12.x"
 
-      - uses: actions/cache@v1
-        with:
-          path: ios/Carthage
-          key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-
       - name: Setup Appcelerator
         run: ./scripts/setup_appc.sh ${{ secrets.APPC_USER_NAME }} ${{ secrets.APPC_PASSWORD }}
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -8,6 +8,8 @@ on:
 jobs:
   release:
     runs-on: macos-latest
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
     steps:
       - uses: actions/checkout@v2
 
@@ -32,11 +34,6 @@ jobs:
           NOTES="${NOTES//$'\r'/'%0D'}"
           echo ::set-output name=NOTES::"$NOTES"
 
-      - uses: actions/cache@v1
-        with:
-          path: ios/Carthage
-          key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-
       - name: Setup Appcelerator
         run: ./scripts/setup_appc.sh ${{ secrets.APPC_USER_NAME }} ${{ secrets.APPC_PASSWORD }}
 
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ xcuserdata
 
 .idea/
 libs/
+build/
 
 android/documentation
 android/example
@@ -31,4 +32,5 @@ ios/*.zip
 ios/Airship
 ios/Carthage
 ios/platform/*.framework
+ios/platform/*.xcframework/*
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Airship Titanium Module
 
+## Version 8.0.0 - September 29, 2020
+Major release for iOS Airship SDK 14.1.2 and Android SDK 14.0.1. The major changes include iOS 14 support and bug fixes for In-App Automation.
+
 ## Version 7.1.0 - August 20, 2020
 Minor release bundling the following SDK updates:
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-  def airshipVersion = "13.3.2"
+  def airshipVersion = "14.0.1"
 
   // ADM & FCM push providers
   implementation "com.urbanairship.android:urbanairship-fcm:$airshipVersion"
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 7.1.0
+version: 8.0.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: Airship Titanium module
@@ -15,4 +15,4 @@ name: AirshipTitanium
 moduleid: ti.airship
 guid: 240dc468-ccad-479d-9510-14e9a7cae5c9
 platform: android
-minsdk: 9.0.0.GA
+minsdk: 9.2.0.GA
diff --git a/android/src/ti/airship/AirshipTitaniumModule.java b/android/src/ti/airship/AirshipTitaniumModule.java
@@ -6,7 +6,7 @@
 import com.urbanairship.UAirship;
 import com.urbanairship.actions.ActionRunRequest;
 import com.urbanairship.actions.AddCustomEventAction;
-import com.urbanairship.iam.InAppMessageManager;
+import com.urbanairship.automation.InAppAutomation;
 import com.urbanairship.json.JsonException;
 import com.urbanairship.json.JsonMap;
 import com.urbanairship.json.JsonValue;
@@ -116,13 +116,13 @@ public boolean getIsUserNotificationsOptedIn() {
     @Kroll.method
     @Kroll.getProperty
     public boolean getIsInAppAutomationPaused() {
-        return InAppMessageManager.shared().isPaused();
+        return InAppAutomation.shared().isPaused();
     }
 
     @Kroll.method
     @Kroll.setProperty
     public void setIsInAppAutomationPaused(boolean paused) {
-        InAppMessageManager.shared().setPaused(paused);
+        InAppAutomation.shared().setPaused(paused);
     }
 
     @Kroll.method
diff --git a/android/src/ti/airship/TiAutopilot.java b/android/src/ti/airship/TiAutopilot.java
@@ -64,7 +64,8 @@ public AirshipConfigOptions createAirshipConfigOptions(Context context) {
                 .setInProduction(properties.getBool(IN_PRODUCTION, false))
                 .setFcmSenderId(properties.getString(GCM_SENDER, null))
                 .setDataCollectionOptInEnabled(properties.getBool(DATA_COLLECTION_OPT_IN, false))
-                .setSite(parseCloudSite(properties.getString(CLOUD_SITE, null)));
+                .setSite(parseCloudSite(properties.getString(CLOUD_SITE, null)))
+                .setUrlAllowListScopeOpenUrl(new String[]{"*"});
 
 
         // Accent color
diff --git a/ios/AirshipTitanium.xcodeproj/project.pbxproj b/ios/AirshipTitanium.xcodeproj/project.pbxproj
diff --git a/ios/AirshipTitanium.xcodeproj/xcshareddata/xcschemes/AirshipTitanium.xcscheme b/ios/AirshipTitanium.xcodeproj/xcshareddata/xcschemes/AirshipTitanium.xcscheme
diff --git a/ios/Cartfile b/ios/Cartfile
diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved
diff --git a/ios/Classes/TiAirshipAutopilot.m b/ios/Classes/TiAirshipAutopilot.m
@@ -1,9 +1,9 @@
 /* Copyright Airship and Contributors */
 
 #import "TiAirshipAutopilot.h"
-#import "TiApp.h"
 #import "TiAirship.h"
 
+@import TitaniumKit;
 @import AirshipCore;
 
 @implementation TiAirshipAutopilot
@@ -45,6 +45,8 @@ + (void)performTakeOff {
     config.inProduction = [appProperties[ProductionConfigKey] boolValue];
     config.dataCollectionOptInEnabled = [appProperties[DataCollectionOptInKey] boolValue];
     config.site = [TiAirshipAutopilot parseCloudSiteString:appProperties[CloudSiteConfigKey]];
+    config.URLAllowListScopeOpenURL = @[@"*"];
+
     [UAirship takeOff:config];
 
     // Set the iOS default foreground presentation options if specified in the tiapp.xml else default to None
diff --git a/ios/Classes/TiAirshipChannelAttributesEditorProxy.h b/ios/Classes/TiAirshipChannelAttributesEditorProxy.h
@@ -1,7 +1,7 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
+@import TitaniumKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ios/Classes/TiAirshipChannelAttributesEditorProxy.m b/ios/Classes/TiAirshipChannelAttributesEditorProxy.m
@@ -2,7 +2,7 @@
 
 #import "TiAirshipChannelAttributesEditorProxy.h"
 #import "TiProxy+TiAirshipAttributeAdditions.h"
-#import "TiBase.h"
+@import TitaniumKit;
 
 @import AirshipCore;
 
diff --git a/ios/Classes/TiAirshipChannelTagGroupsEditorProxy.h b/ios/Classes/TiAirshipChannelTagGroupsEditorProxy.h
@@ -1,7 +1,7 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
+@import TitaniumKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ios/Classes/TiAirshipChannelTagsEditorProxy.h b/ios/Classes/TiAirshipChannelTagsEditorProxy.h
@@ -1,7 +1,7 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
+@import TitaniumKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ios/Classes/TiAirshipChannelTagsEditorProxy.m b/ios/Classes/TiAirshipChannelTagsEditorProxy.m
@@ -1,7 +1,7 @@
 /* Copyright Airship and Contributors */
 
 #import "TiAirshipChannelTagsEditorProxy.h"
-#import "TiUtils.h"
+@import TitaniumKit;
 @import AirshipCore;
 
 @interface TiAirshipChannelTagsEditorProxy ()
diff --git a/ios/Classes/TiAirshipEventEmitter.h b/ios/Classes/TiAirshipEventEmitter.h
@@ -1,8 +1,8 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
 #import "TiAirshipEvent.h"
+@import TitaniumKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ios/Classes/TiAirshipEventEmitter.m b/ios/Classes/TiAirshipEventEmitter.m
@@ -1,9 +1,6 @@
 /* Copyright Airship and Contributors */
 
 #import "TiAirshipEventEmitter.h"
-#import "TiProxy.h"
-#import "TiAirshipEvent.h"
-#import "TiApp.h"
 
 @interface TiAirshipEventListeners : NSObject
 @property (nonatomic, weak) TiProxy *proxy;
diff --git a/ios/Classes/TiAirshipModule.h b/ios/Classes/TiAirshipModule.h
@@ -1,14 +1,14 @@
 /* Copyright Airship and Contributors */
 
-#import "TiModule.h"
-#import "TiAirshipDeeplink.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
+@import TitaniumKit;
 @import AirshipCore;
 @import AirshipMessageCenter;
 @import AirshipAutomation;
 
+#import "TiAirshipDeeplink.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
 @interface TiAirshipModule : TiModule
 
 NS_ASSUME_NONNULL_END
diff --git a/ios/Classes/TiAirshipModule.m b/ios/Classes/TiAirshipModule.m
@@ -1,9 +1,7 @@
 /* Copyright Airship and Contributors */
 
+@import TitaniumKit;
 #import "TiAirshipModule.h"
-#import "TiBase.h"
-#import "TiHost.h"
-#import "TiUtils.h"
 #import "TiAirship.h"
 #import "TiAirshipPushReceivedEvent.h"
 #import "TiAirshipDeepLinkEvent.h"
@@ -161,12 +159,12 @@ - (void)setNamedUser:(id)args {
 }
 
 - (id)isInAppAutomationPaused {
-    return NUMBOOL([UAInAppMessageManager shared].isPaused);
+    return NUMBOOL([UAInAppAutomation shared].isPaused);
 }
 
 - (void)setIsInAppAutomationPaused:(id)args {
     ENSURE_SINGLE_ARG(args, NSNumber);
-    [UAInAppMessageManager shared].paused = [args boolValue];
+    [UAInAppAutomation shared].paused = [args boolValue];
 }
 
 - (void)associateIdentifier:(id)args {
diff --git a/ios/Classes/TiAirshipNamedUserAttributesEditorProxy.h b/ios/Classes/TiAirshipNamedUserAttributesEditorProxy.h
@@ -1,7 +1,7 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
+@import TitaniumKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ios/Classes/TiAirshipNamedUserAttributesEditorProxy.m b/ios/Classes/TiAirshipNamedUserAttributesEditorProxy.m
@@ -2,8 +2,7 @@
 
 #import "TiAirshipNamedUserAttributesEditorProxy.h"
 #import "TiProxy+TiAirshipAttributeAdditions.h"
-#import "TiBase.h"
-
+@import TitaniumKit;
 @import AirshipCore;
 
 @interface TiAirshipNamedUserAttributesEditorProxy()
diff --git a/ios/Classes/TiAirshipNamedUserTagGroupsEditorProxy.h b/ios/Classes/TiAirshipNamedUserTagGroupsEditorProxy.h
@@ -1,7 +1,7 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
+@import TitaniumKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ios/Classes/TiProxy+TiAirshipAttributeAdditions.h b/ios/Classes/TiProxy+TiAirshipAttributeAdditions.h
@@ -1,7 +1,7 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
+@import TitaniumKit;
 @import AirshipCore;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/ios/Classes/TiProxy+TiAirshipAttributeAdditions.m b/ios/Classes/TiProxy+TiAirshipAttributeAdditions.m
@@ -1,11 +1,10 @@
 /* Copyright Airship and Contributors */
 
 #import "TiProxy+TiAirshipAttributeAdditions.h"
-#import "TiBase.h"
+@import TitaniumKit;
 
 @implementation TiProxy(TiAirshipAttributeAdditions)
 
-
 -(void)setAttributeFromArgs:(id)args onMutations:(UAAttributeMutations *)mutations {
     ENSURE_ARG_COUNT(args, 2);
     ENSURE_STRING(args[0]);
diff --git a/ios/Classes/TiProxy+TiAirshipTagGroupOperationAddition.h b/ios/Classes/TiProxy+TiAirshipTagGroupOperationAddition.h
@@ -1,7 +1,8 @@
 /* Copyright Airship and Contributors */
 
 #import <Foundation/Foundation.h>
-#import "TiProxy.h"
+
+@import TitaniumKit;
 #import "TiAirshipTagGroupOperation.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/ios/Classes/TiProxy+TiAirshipTagGroupOperationAddition.m b/ios/Classes/TiProxy+TiAirshipTagGroupOperationAddition.m
@@ -1,7 +1,8 @@
 /* Copyright Airship and Contributors */
 
 #import "TiProxy+TiAirshipTagGroupOperationAddition.h"
-#import "TiBase.h"
+
+@import TitaniumKit;
 
 @implementation TiProxy(TiAirshipTagGroupOperationAddition)
 
diff --git a/ios/manifest b/ios/manifest
diff --git a/ios/module.xcconfig b/ios/module.xcconfig
diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig
diff --git a/scripts/build_ios.sh b/scripts/build_ios.sh
