Prefixing all Glimr regions with GL_, other optimizations

KatalysatorAB · Aug 15, 2016 · 27e32cd · 27e32cd
1 parent c50f2e3
commit 27e32cd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/KatalysatorSDK.framework/Versions/A/KatalysatorSDK b/KatalysatorSDK.framework/Versions/A/KatalysatorSDK
diff --git a/Sample.xcodeproj/project.pbxproj b/Sample.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		320D1A911D5FACC0009B4ADC /* Location.gpx in Resources */ = {isa = PBXBuildFile; fileRef = 320D1A901D5FACC0009B4ADC /* Location.gpx */; };
 		3232B4D618246C47009E75E7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3232B4D518246C47009E75E7 /* Foundation.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		3232B4D818246C47009E75E7 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3232B4D718246C47009E75E7 /* CoreGraphics.framework */; };
 		3232B4DA18246C47009E75E7 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3232B4D918246C47009E75E7 /* UIKit.framework */; };
@@ -25,6 +26,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		320D1A901D5FACC0009B4ADC /* Location.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Location.gpx; sourceTree = "<group>"; };
 		3232B4D218246C47009E75E7 /* Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Sample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		3232B4D518246C47009E75E7 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		3232B4D718246C47009E75E7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -118,6 +120,7 @@
 		3232B4DC18246C47009E75E7 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				320D1A901D5FACC0009B4ADC /* Location.gpx */,
 				3232B4DD18246C47009E75E7 /* Sample-Info.plist */,
 				3232B4DE18246C47009E75E7 /* InfoPlist.strings */,
 				3232B4E118246C47009E75E7 /* main.m */,
@@ -190,6 +193,7 @@
 			files = (
 				3232B4EE18246C47009E75E7 /* Images.xcassets in Resources */,
 				3232B4E018246C47009E75E7 /* InfoPlist.strings in Resources */,
+				320D1A911D5FACC0009B4ADC /* Location.gpx in Resources */,
 				3232B4E918246C47009E75E7 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -322,7 +326,7 @@
 				GCC_PREFIX_HEADER = "Sample/Sample-Prefix.pch";
 				INFOPLIST_FILE = "Sample/Sample-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				PRODUCT_BUNDLE_IDENTIFIER = se.glimr.retarget;
+				PRODUCT_BUNDLE_IDENTIFIER = se.glimr.sdk;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = "arm64 armv7";
@@ -345,7 +349,7 @@
 				GCC_PREFIX_HEADER = "Sample/Sample-Prefix.pch";
 				INFOPLIST_FILE = "Sample/Sample-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				PRODUCT_BUNDLE_IDENTIFIER = se.glimr.retarget;
+				PRODUCT_BUNDLE_IDENTIFIER = se.glimr.sdk;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = "arm64 armv7";

diff --git a/Sample/AppDelegate.m b/Sample/AppDelegate.m
@@ -19,7 +19,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     KATConfiguration *config = [[KATConfiguration alloc] init];
     config.apiToken = [[NSUUID alloc] initWithUUIDString:GLIMR_API_TOKEN];
     config.suppressBluetoothAccuracyAlert = YES;
-
+    config.askForLocationPermission = YES;
+
     KATBeaconManager *beaconManager = [[KATBeaconManager alloc] initWithConfiguration:config];
     [beaconManager startCollecting];
 

diff --git a/Sample/Location.gpx b/Sample/Location.gpx
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<gpx version="1.1" creator="Xcode">
+    <wpt lat="59.88610293" lon="17.66736209">
+        <name>Stockholm</name>
+    </wpt>
+</gpx>
diff --git a/Sample/Sample-Info.plist b/Sample/Sample-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.5</string>
+	<string>1.8.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>