diff --git a/package.json b/package.json index 857dc09..11cb8bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.wikitude.phonegap.wikitudeplugin", - "version": "7.1.0", + "version": "7.2.0", "description": "Augmented Reality Wikitude SDK Plugin \n The Wikitude Cordova Plugin enables developers to embed an augmented reality view into their PhoneGap project. You can create a fully featured app with advanced augmented reality features, including image recognition, purely using HTML, CSS and JavaScript.\n ", "cordova": { "id": "", diff --git a/plugin.xml b/plugin.xml index 3b4232c..df1dba7 100755 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="7.2.0"> Augmented Reality - Wikitude SDK Plugin @@ -20,7 +20,8 @@ - + + @@ -33,8 +34,11 @@ + + + - + @@ -64,11 +68,6 @@ - - - - - diff --git a/src/android/libs/build-extras.gradle b/src/android/build-extras.gradle similarity index 100% rename from src/android/libs/build-extras.gradle rename to src/android/build-extras.gradle diff --git a/src/android/libs/wikitudesdk.aar b/src/android/wikitudesdk.aar similarity index 63% rename from src/android/libs/wikitudesdk.aar rename to src/android/wikitudesdk.aar index 593b191..7cbd858 100644 Binary files a/src/android/libs/wikitudesdk.aar and b/src/android/wikitudesdk.aar differ diff --git a/src/ios/WTARViewController.m b/src/ios/WTARViewController.m index 5388b73..2ebb0d9 100644 --- a/src/ios/WTARViewController.m +++ b/src/ios/WTARViewController.m @@ -46,7 +46,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil // Custom initialization _startupConfiguration = [[WTArchitectStartupConfiguration alloc] init]; - self.architectView = [[WTArchitectView alloc] initWithFrame:[[UIScreen mainScreen] bounds] motionManager:motionManagerOrNil]; + self.architectView = [[WTArchitectView alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.architectView.delegate = self; self.architectView.debugDelegate = self; _startSDKAfterAppResume = YES; @@ -90,8 +90,8 @@ - (void)viewDidLoad [self.architectView setShouldRotate:YES toInterfaceOrientation:[[UIApplication sharedApplication] statusBarOrientation]]; - UISwipeGestureRecognizer *swipeBackRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(didSwipeBack:)]; - swipeBackRecognizer.direction = UISwipeGestureRecognizerDirectionRight; + UIScreenEdgePanGestureRecognizer *swipeBackRecognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(didSwipeBack:)]; + swipeBackRecognizer.edges = UIRectEdgeLeft; swipeBackRecognizer.delegate = self; [self.view addGestureRecognizer:swipeBackRecognizer]; diff --git a/src/ios/WikitudeSDK.framework/Info.plist b/src/ios/WikitudeSDK.framework/Info.plist index 8d2836b..3a838ea 100644 Binary files a/src/ios/WikitudeSDK.framework/Info.plist and b/src/ios/WikitudeSDK.framework/Info.plist differ diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 b/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 index ed3b5f5..ea02b39 100755 Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 differ diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7 b/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7 index 77971e4..1ee7d99 100755 Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7 differ diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7s b/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7s index da2107e..1dbbe1b 100755 Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7s and b/src/ios/WikitudeSDK.framework/WikitudeSDK-armv7s differ diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-i386 b/src/ios/WikitudeSDK.framework/WikitudeSDK-i386 index 99e9c79..602977d 100755 Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-i386 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-i386 differ diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 b/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 index 708b406..fe8a8cb 100755 Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 differ diff --git a/src/ios/WikitudeSDK.framework/strip_wikitude_framework.sh b/src/ios/WikitudeSDK.framework/strip_wikitude_framework.sh index 5e61fdf..8a6a20d 100644 --- a/src/ios/WikitudeSDK.framework/strip_wikitude_framework.sh +++ b/src/ios/WikitudeSDK.framework/strip_wikitude_framework.sh @@ -12,6 +12,7 @@ STRIP_SIMULATOR_ARCHITECTURES=false WIKITUDE_FRAMEWORK_PATH="" FRAMEWORK_MANIPULATION_SCRIPTS=( "strip_wikitude_framework.sh" "wikitude_bitcode.sh" ) +FRAMEWORK_LIBRARY_NAME=Wikitude*SDK usage() { cat <