Merge pull request #33 from jvandijk/feature/upgrade-ios-sdk

Upgrade iOS SDK to version 2.5.2
williamrijksen · Apr 29, 2017 · cb2a6b2 · cb2a6b2
2 parents 5a751bc + 95e48ce
commit cb2a6b2
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 80 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
-os: osx
+language: objective-c
+osx_image: xcode8.2
 
 env:
   global:
@@ -22,15 +23,14 @@ before_install:
 - brew tap oclint/formulae
 - brew install oclint
 - oclint -version
-- rvm get head
 
 install:
 - cd $MODULE_ROOT
-- curl -o install.sh https://rawcdn.githack.com/williamrijksen/ci/v8/travis/install.sh
+- curl -o install.sh https://rawcdn.githack.com/sgtcoolguy/ci/v8/travis/install.sh
 - source install.sh -s "--branch 6_0_X"
 
 before_script:
-- curl -o script.sh https://rawcdn.githack.com/williamrijksen/ci/v8/travis/script.sh
+- curl -o script.sh https://rawcdn.githack.com/sgtcoolguy/ci/v8/travis/script.sh
 - chmod +x script.sh
 
 script:

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Before setting up the Titanium SDK, you must generate the appropriate credential
 
     ```xml
     <modules>
-      <module platform="iphone" version="1.5.1">com.williamrijksen.onesignal</module>
+      <module platform="iphone" version="1.6.0">com.williamrijksen.onesignal</module>
       <module platform="android" version="1.6.0">com.williamrijksen.onesignal</module>
     </modules>
     ```
@@ -37,6 +37,10 @@ Before setting up the Titanium SDK, you must generate the appropriate credential
     <meta-data android:name="onesignal_google_project_number"
                    android:value="str:[Google project id]" />
     ```
+1. To use rich notifications on iOS 10 you need to add an extension to your app.
+   To do so see:
+   - [https://documentation.onesignal.com/docs/ios-sdk-setup#section-1-add-notification-service-extension](https://documentation.onesignal.com/docs/ios-sdk-setup#section-1-add-notification-service-extension)
+   - [http://docs.appcelerator.com/platform/latest/#!/guide/Creating_iOS_Extensions_-_Siri_Intents](http://docs.appcelerator.com/platform/latest/#!/guide/Creating_iOS_Extensions_-_Siri_Intents)
 
 ### Usage
 1. Register device for Push Notifications

diff --git a/ios/Classes/ComWilliamrijksenOnesignalModuleAssets.m b/ios/Classes/ComWilliamrijksenOnesignalModuleAssets.m
@@ -0,0 +1,24 @@
+/**
+ * This is a generated file. Do not edit or your changes will be lost
+ */
+#import "ComWilliamrijksenOnesignalModuleAssets.h"
+
+extern NSData* filterDataInRange(NSData* thedata, NSRange range);
+
+@implementation ComWilliamrijksenOnesignalModuleAssets
+
+- (NSData*) moduleAsset
+{
+
+
+	return nil;
+}
+
+- (NSData*) resolveModuleAsset:(NSString*)path
+{
+
+
+	return nil;
+}
+
+@end
diff --git a/ios/com.williamrijksen.onesignal.xcodeproj/project.pbxproj b/ios/com.williamrijksen.onesignal.xcodeproj/project.pbxproj
@@ -22,11 +22,11 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		1F9396FF1EAF8ADB0076FF5A /* OneSignal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F9396FE1EAF8ADB0076FF5A /* OneSignal.framework */; };
 		24DD6CF91134B3F500162E58 /* ComWilliamrijksenOnesignalModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DD6CF71134B3F500162E58 /* ComWilliamrijksenOnesignalModule.h */; };
 		24DD6CFA1134B3F500162E58 /* ComWilliamrijksenOnesignalModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* ComWilliamrijksenOnesignalModule.m */; };
 		AA747D9F0F9514B9006C5449 /* ComWilliamrijksenOnesignal_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* ComWilliamrijksenOnesignal_Prefix.pch */; };
 		AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
-		E84DA4BA1E3F8ACF00F5D794 /* OneSignal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E84DA4B91E3F8ACF00F5D794 /* OneSignal.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -40,22 +40,22 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		1F9396FE1EAF8ADB0076FF5A /* OneSignal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OneSignal.framework; path = platform/OneSignal.framework; sourceTree = "<group>"; };
 		24DD6CF71134B3F500162E58 /* ComWilliamrijksenOnesignalModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ComWilliamrijksenOnesignalModule.h; path = Classes/ComWilliamrijksenOnesignalModule.h; sourceTree = "<group>"; };
 		24DD6CF81134B3F500162E58 /* ComWilliamrijksenOnesignalModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComWilliamrijksenOnesignalModule.m; path = Classes/ComWilliamrijksenOnesignalModule.m; sourceTree = "<group>"; };
 		24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = "<group>"; };
 		AA747D9E0F9514B9006C5449 /* ComWilliamrijksenOnesignal_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComWilliamrijksenOnesignal_Prefix.pch; sourceTree = SOURCE_ROOT; };
 		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		D2AAC07E0554694100DB518D /* libComWilliamrijksenOnesignal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libComWilliamrijksenOnesignal.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		E84DA4B91E3F8ACF00F5D794 /* OneSignal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OneSignal.framework; path = platform/OneSignal.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		D2AAC07C0554694100DB518D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E84DA4BA1E3F8ACF00F5D794 /* OneSignal.framework in Frameworks */,
 				AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
+				1F9396FF1EAF8ADB0076FF5A /* OneSignal.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -84,7 +84,7 @@
 		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				E84DA4B91E3F8ACF00F5D794 /* OneSignal.framework */,
+				1F9396FE1EAF8ADB0076FF5A /* OneSignal.framework */,
 				AACBBE490F95108600F1A2B1 /* Foundation.framework */,
 			);
 			name = Frameworks;
@@ -232,7 +232,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = (
 					"-DDEBUG",
@@ -274,7 +274,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
@@ -309,6 +309,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DDEBUG",
@@ -347,7 +348,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = ComWilliamrijksenOnesignal;

diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.5.1
+version: 1.6.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: com.williamrijksen.onesignal
@@ -15,5 +15,5 @@ name: com.williamrijksen.onesignal
 moduleid: com.williamrijksen.onesignal
 guid: 67065763-fd5e-4069-a877-6c7fd328f877
 platform: iphone
-minsdk: 5.5.0.GA
+minsdk: 6.0.0.GA
 architectures: armv7 arm64 i386 x86_64
diff --git a/ios/module.xcconfig b/ios/module.xcconfig
@@ -1,11 +1,11 @@
 //
-// PLACE ANY BUILD DEFINITIONS IN THIS FILE AND THEY WILL BE 
+// PLACE ANY BUILD DEFINITIONS IN THIS FILE AND THEY WILL BE
 // PICKED UP DURING THE APP BUILD FOR YOUR MODULE
 //
 // see the following webpage for instructions on the settings
 // for this file:
 // http://developer.apple.com/mac/library/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/400-Build_Configurations/build_configs.html
-// 
+//
 
 //
 // How to add a Framework (example)
@@ -24,7 +24,7 @@
 //
 //
 // IMPORTANT NOTE: always use $(inherited) in your overrides
-// 
-FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/com.williamrijksen.onesignal/1.5.1/platform "~/Library/Application\ Support/Titanium/modules/iphone/com.williamrijksen.onesignal/1.5.1/platform"
-OTHER_LDFLAGS=$(inherited) -framework OneSignal
+//
+FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/com.williamrijksen.onesignal/1.6.0/platform "~/Library/Application\ Support/Titanium/modules/iphone/com.williamrijksen.onesignal/1.6.0/platform"
+OTHER_LDFLAGS=$(inherited) -framework OneSignal -framework UserNotifications
 LD_RUNPATH_SEARCH_PATHS= $(inherited) "@executable_path/Frameworks" $(FRAMEWORK_SEARCH_PATHS)