Merge branch 'release/1.2'

obscure-com · May 21, 2015 · df583ba · df583ba
2 parents 2cb1e2d + 12ebfba
commit df583ba
Show file tree

Hide file tree

Showing 43 changed files with 1,344 additions and 62 deletions.
diff --git a/mobile/ios/Classes/ComObscureTicarouselCarouselViewProxy.m b/mobile/ios/Classes/ComObscureTicarouselCarouselViewProxy.m
@@ -117,7 +117,7 @@ - (void)childWillResize:(TiViewProxy *)child {
 #pragma mark iCarousel Properties
 
 - (id)currentItemIndex {
-    return NUMINT(self.carousel.currentItemIndex);
+    return NUMLONG(self.carousel.currentItemIndex);
 }
 
 - (id)carouselType {
@@ -209,11 +209,11 @@ - (void)setScrollEnabled:(id)val {
 }
 
 - (id)numberOfItems {
-    return NUMINT(self.carousel.numberOfItems);
+    return NUMLONG(self.carousel.numberOfItems);
 }
 
 - (id)numberOfPlaceholders {
-    return NUMINT(self.carousel.numberOfPlaceholders);
+    return NUMLONG(self.carousel.numberOfPlaceholders);
 }
 
 - (id)scrollOffset {
@@ -348,7 +348,7 @@ - (id)indexOfItemView:(id)args {
     ENSURE_ARG_AT_INDEX(v, args, 0, TiUIView)
 
     NSInteger result = [self.carousel indexOfItemView:v];
-    return result != NSNotFound ? NUMINT(result) : nil;
+    return result != NSNotFound ? NUMLONG(result) : nil;
 }
 
 - (id)indexOfItemViewOrSubview:(id)args {
@@ -357,7 +357,7 @@ - (id)indexOfItemViewOrSubview:(id)args {
     TiUIView * v;
     ENSURE_ARG_AT_INDEX(v, args, 0, TiUIView)
 
-    return NUMINT([self.carousel indexOfItemViewOrSubview:v]);
+    return NUMLONG([self.carousel indexOfItemViewOrSubview:v]);
 }
 
 - (id)offsetForItemAtIndex:(id)args {
@@ -483,22 +483,22 @@ - (CATransform3D)carousel:(iCarousel *)_carousel itemTransformForOffset:(CGFloat
 
 - (void)carouselDidEndScrollingAnimation:(iCarousel *)carousel {
     NSDictionary * obj = [NSDictionary dictionaryWithObjectsAndKeys:
-                          NUMINT(carousel.currentItemIndex), @"currentIndex",
+                          NUMLONG(carousel.currentItemIndex), @"currentIndex",
                           nil];
     [self fireEvent:kCarouselScrollEvent withObject:obj];
 }
 
 - (void)carouselCurrentItemIndexDidChange:(iCarousel *)carousel {
     NSDictionary * obj = [NSDictionary dictionaryWithObjectsAndKeys:
-                          NUMINT(carousel.currentItemIndex), @"currentIndex",
+                          NUMLONG(carousel.currentItemIndex), @"currentIndex",
                           nil];
     [self fireEvent:kCarouselChangeEvent withObject:obj];
 }
 
 - (void)carousel:(iCarousel *)carousel didSelectItemAtIndex:(NSInteger)index {
     NSDictionary * obj = [NSDictionary dictionaryWithObjectsAndKeys:
-                          NUMINT(index), @"selectedIndex",
-                          NUMINT(carousel.currentItemIndex), @"currentIndex",
+                          NUMLONG(index), @"selectedIndex",
+                          NUMLONG(carousel.currentItemIndex), @"currentIndex",
                           nil];
     [self fireEvent:kCarouselSelectEvent withObject:obj];
 }

diff --git a/mobile/ios/Classes/TransformParser.m b/mobile/ios/Classes/TransformParser.m
@@ -23,23 +23,23 @@ + (CATransform3D)addTransforms:(NSArray *)dicts toTransform:(CATransform3D)trans
                 transform = CATransform3DTranslate(transform, [[values objectAtIndex:0] floatValue], [[values objectAtIndex:1] floatValue], [[values objectAtIndex:2] floatValue]);
             }
             else {
-                NSLog(@"[ERROR] incorrect number of values (%d), skipping translate", [values count]);
+                NSLog(@"[ERROR] incorrect number of values (%lu), skipping translate", [values count]);
             }
         }
         else if ([@"rotate" isEqualToString:type]) {
             if ([values count] == 4) {
                 transform = CATransform3DRotate(transform, [[values objectAtIndex:0] floatValue], [[values objectAtIndex:1] floatValue], [[values objectAtIndex:2] floatValue], [[values objectAtIndex:3] floatValue]);
             }
             else {
-                NSLog(@"[ERROR] incorrect number of values (%d), skipping rotate", [values count]);
+                NSLog(@"[ERROR] incorrect number of values (%lu), skipping rotate", [values count]);
             }
         }
         else if ([@"scale" isEqualToString:type]) {
             if ([values count] == 3) {
                 transform = CATransform3DScale(transform, [[values objectAtIndex:0] floatValue], [[values objectAtIndex:1] floatValue], [[values objectAtIndex:2] floatValue]);
             }
             else {
-                NSLog(@"[ERROR] incorrect number of values (%d), skipping scale", [values count]);
+                NSLog(@"[ERROR] incorrect number of values (%lu), skipping scale", [values count]);
             }
         }
     }

diff --git a/mobile/ios/manifest b/mobile/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.1
+version: 1.2
 apiversion: 2
 description: module that wraps the iCarousel library by Nick Lockwood 
 author: Paul Mietz Egli
@@ -15,4 +15,5 @@ name: ticarousel
 moduleid: com.obscure.ticarousel
 guid: 2295ea8d-38ef-4786-b48b-b76c27e14fbb
 platform: iphone
-minsdk: 2.0.1.GA2
+minsdk: 3.5.0.GA
+architectures: armv7 arm64 i386 x86_64
diff --git a/mobile/ios/ticarousel.xcodeproj/project.pbxproj b/mobile/ios/ticarousel.xcodeproj/project.pbxproj
@@ -23,20 +23,20 @@
 
 /* Begin PBXBuildFile section */
 		24DD6CF91134B3F500162E58 /* ComObscureTicarouselModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DD6CF71134B3F500162E58 /* ComObscureTicarouselModule.h */; };
-		24DD6CFA1134B3F500162E58 /* ComObscureTicarouselModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* ComObscureTicarouselModule.m */; };
+		24DD6CFA1134B3F500162E58 /* ComObscureTicarouselModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* ComObscureTicarouselModule.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		AA747D9F0F9514B9006C5449 /* ComObscureTicarousel_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* ComObscureTicarousel_Prefix.pch */; };
 		AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
 		DAA4DCA51562AFA000192EA3 /* TransformParser.h in Headers */ = {isa = PBXBuildFile; fileRef = DAA4DCA31562AFA000192EA3 /* TransformParser.h */; };
-		DAA4DCA61562AFA000192EA3 /* TransformParser.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA4DCA41562AFA000192EA3 /* TransformParser.m */; };
+		DAA4DCA61562AFA000192EA3 /* TransformParser.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA4DCA41562AFA000192EA3 /* TransformParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		DAEF8D62155C1ADA0053A8FA /* iCarousel.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEF8D60155C1ADA0053A8FA /* iCarousel.h */; };
 		DAEF8D63155C1ADA0053A8FA /* iCarousel.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEF8D61155C1ADA0053A8FA /* iCarousel.m */; };
 		DAEF8D65155C1B0F0053A8FA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAEF8D64155C1B0F0053A8FA /* QuartzCore.framework */; };
 		DAEF8D67155C1B140053A8FA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAEF8D66155C1B140053A8FA /* UIKit.framework */; };
 		DAEF8D69155C1B1A0053A8FA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAEF8D68155C1B1A0053A8FA /* CoreGraphics.framework */; };
 		DAEF8D6C155C1E770053A8FA /* ComObscureTicarouselCarouselViewProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEF8D6A155C1E770053A8FA /* ComObscureTicarouselCarouselViewProxy.h */; };
-		DAEF8D6D155C1E770053A8FA /* ComObscureTicarouselCarouselViewProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEF8D6B155C1E770053A8FA /* ComObscureTicarouselCarouselViewProxy.m */; };
+		DAEF8D6D155C1E770053A8FA /* ComObscureTicarouselCarouselViewProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEF8D6B155C1E770053A8FA /* ComObscureTicarouselCarouselViewProxy.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		DAEF8D70155C1F030053A8FA /* ComObscureTicarouselCarouselView.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEF8D6E155C1F030053A8FA /* ComObscureTicarouselCarouselView.h */; };
-		DAEF8D71155C1F030053A8FA /* ComObscureTicarouselCarouselView.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEF8D6F155C1F030053A8FA /* ComObscureTicarouselCarouselView.m */; };
+		DAEF8D71155C1F030053A8FA /* ComObscureTicarouselCarouselView.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEF8D6F155C1F030053A8FA /* ComObscureTicarouselCarouselView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -200,7 +200,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0610;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ticarousel" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -267,15 +267,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
 			buildSettings = {
-				ARCHS = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphoneos*]" = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphonesimulator*]" = i386;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DSTROOT = /tmp/ComObscureTicarousel.dst;
@@ -306,7 +297,6 @@
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
@@ -316,15 +306,6 @@
 			baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphoneos*]" = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphonesimulator*]" = i386;
 				DSTROOT = /tmp/ComObscureTicarousel.dst;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_MODEL_TUNING = G5;
@@ -343,13 +324,11 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = ComObscureTicarousel;
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;
@@ -358,15 +337,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
 			buildSettings = {
-				ARCHS = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphoneos*]" = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphonesimulator*]" = i386;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DSTROOT = /tmp/ComObscureTicarousel.dst;
@@ -387,7 +358,8 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DDEBUG",
 					"-DTI_POST_1_2",
@@ -407,15 +379,7 @@
 			baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphoneos*]" = (
-					armv6,
-					armv7,
-				);
-				"ARCHS[sdk=iphonesimulator*]" = i386;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				DSTROOT = /tmp/ComObscureTicarousel.dst;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_MODEL_TUNING = G5;
@@ -434,7 +398,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = ComObscureTicarousel;

diff --git a/mobile/ios/titanium.xcconfig b/mobile/ios/titanium.xcconfig
@@ -4,7 +4,7 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 3.1.2.GA
+TITANIUM_SDK_VERSION = 3.5.1.GA
 
 
 // 

diff --git a/mobile/ios/vendor/iCarousel b/mobile/ios/vendor/iCarousel
diff --git a/mobile/noarch/testapp/.gitignore b/mobile/noarch/testapp/.gitignore
@@ -0,0 +1,2 @@
+modules
+build
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
     //
     //
-    TITANIUM_SDK_VERSION = 3.1.2.GA
+    TITANIUM_SDK_VERSION = 3.5.1.GA
     //
@@ Expand Down @@