chore: move to SDK 8.2.0.GA

hansemannn · Oct 3, 2019 · 052331a · 052331a
1 parent 247b1a1
commit 052331a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/Classes/TiGooglemapsIndoorDisplayProxy.h b/Classes/TiGooglemapsIndoorDisplayProxy.h
@@ -4,7 +4,8 @@
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
-#import "TiProxy.h"
+
+#import <TitaniumKit/TitaniumKit.h>
 #import <GoogleMaps/GoogleMaps.h>
 
 @interface TiGooglemapsIndoorDisplayProxy : TiProxy <GMSIndoorDisplayDelegate> {

diff --git a/Classes/TiGooglemapsIndoorLevelProxy.m b/Classes/TiGooglemapsIndoorLevelProxy.m
@@ -27,12 +27,12 @@ - (GMSIndoorLevel *_Nonnull)indoorLevel
 
 - (NSString *_Nullable)name
 {
-  return NULL_IF_NIL([_indoorLevel name]);
+  return [_indoorLevel name];
 }
 
 - (NSString *_Nullable)shortName
 {
-  return NULL_IF_NIL([_indoorLevel shortName]);
+  return [_indoorLevel shortName];
 }
 
 @end
diff --git a/Classes/TiGooglemapsTileProxy.h b/Classes/TiGooglemapsTileProxy.h
@@ -4,7 +4,7 @@
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
-#import "TiProxy.h"
+#import <TitaniumKit/TitaniumKit.h>
 #import <GoogleMaps/GoogleMaps.h>
 
 @interface TiGooglemapsTileProxy : TiProxy <GMSTileReceiver> {

diff --git a/Classes/TiGooglemapsTileProxy.m b/Classes/TiGooglemapsTileProxy.m
@@ -6,7 +6,6 @@
  */
 
 #import "TiGooglemapsTileProxy.h"
-#import "TiUtils.h"
 
 @implementation TiGooglemapsTileProxy
 

diff --git a/manifest b/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.0.0
+version: 5.0.1
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: ti.googlemaps

diff --git a/ti.googlemaps.xcodeproj/project.pbxproj b/ti.googlemaps.xcodeproj/project.pbxproj
@@ -976,6 +976,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = NO;
 				CLANG_CXX_LIBRARY = "compiler-default";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -1049,6 +1050,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = NO;
 				CLANG_CXX_LIBRARY = "compiler-default";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/ti.googlemaps.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ti.googlemaps.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
 </plist>
diff --git a/titanium.xcconfig b/titanium.xcconfig
@@ -4,13 +4,12 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 7.5.0.GA
+TITANIUM_SDK_VERSION = 8.2.0.GA
 
 
 //
 // THESE SHOULD BE OK GENERALLY AS-IS
 //
-TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
-TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include"
-TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore"
-HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2)
+TITANIUM_SDK = /Users/hans/Library/Application Support/Titanium/mobilesdk/osx/8.3.0
+HEADER_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/include"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/Frameworks"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
      */
     #import "TiGooglemapsTileProxy.h"
-    #import "TiUtils.h"
     @implementation TiGooglemapsTileProxy
@@ Expand Down @@