diff --git a/mobile/ios/Classes/ComObscureTicarouselCarouselView.m b/mobile/ios/Classes/ComObscureTicarouselCarouselView.m old mode 100644 new mode 100755 index 6795b7e..b56f84a --- a/mobile/ios/Classes/ComObscureTicarouselCarouselView.m +++ b/mobile/ios/Classes/ComObscureTicarouselCarouselView.m @@ -21,8 +21,7 @@ - (id)initWithFrame:(CGRect)frame { - (void)dealloc { self.carousel.delegate = nil; self.carousel.dataSource = nil; - - [super dealloc]; + /* [super dealloc]; */ } - (void)frameSizeChanged:(CGRect)frame bounds:(CGRect)bounds { @@ -30,14 +29,12 @@ - (void)frameSizeChanged:(CGRect)frame bounds:(CGRect)bounds { [TiUtils setView:self.carousel positionRect:bounds]; } - - (iCarousel *)carousel { if (!_carousel) { _carousel = [[iCarousel alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, [self bounds].size.height)]; _carousel.type = iCarouselTypeLinear; _carousel.delegate = (id) self.proxy; _carousel.dataSource = (id) self.proxy; - _carousel.clipsToBounds = YES; // never overflow the carousel bounds } if (_carousel.superview != self) { diff --git a/mobile/ios/Classes/ComObscureTicarouselCarouselViewProxy.m b/mobile/ios/Classes/ComObscureTicarouselCarouselViewProxy.m old mode 100644 new mode 100755 index 7169ef4..0c11f4c --- a/mobile/ios/Classes/ComObscureTicarouselCarouselViewProxy.m +++ b/mobile/ios/Classes/ComObscureTicarouselCarouselViewProxy.m @@ -38,7 +38,7 @@ - (id)init { self.numberOfVisibleItems = 3; self.doubleSided = [NSNumber numberWithBool:YES]; - transformOptionNames = [[NSDictionary dictionaryWithObjectsAndKeys: + transformOptionNames = [NSDictionary dictionaryWithObjectsAndKeys: @"angle", [NSNumber numberWithInt:iCarouselOptionAngle], @"arc", [NSNumber numberWithInt:iCarouselOptionArc], @"count", [NSNumber numberWithInt:iCarouselOptionCount], @@ -46,8 +46,7 @@ - (id)init { @"spacing", [NSNumber numberWithInt:iCarouselOptionSpacing], @"tilt", [NSNumber numberWithInt:iCarouselOptionTilt], @"yoffset", [NSNumber numberWithInt:iCarouselOptionExYOffset], - @"zoffset", [NSNumber numberWithInt:iCarouselOptionExZOffset], - nil] retain]; + @"zoffset", [NSNumber numberWithInt:iCarouselOptionExZOffset], nil]; } return self; } @@ -56,9 +55,9 @@ - (void)dealloc { // clean up views pthread_rwlock_destroy(&viewsLock); [viewProxies makeObjectsPerformSelector:@selector(setParent:) withObject:nil]; - [viewProxies release]; - [transformOptionNames release]; - [super dealloc]; + //[viewProxies release]; + //[transformOptionNames release]; + //[super dealloc]; } - (iCarousel *)carousel { @@ -96,7 +95,7 @@ - (void)setViews:(id)args { [self forgetProxy:oldViewProxy]; } } - [viewProxies autorelease]; +// [viewProxies autorelease]; viewProxies = [args mutableCopy]; [self unlockViews]; [self replaceValue:args forKey:@"views" notification:YES]; diff --git a/mobile/ios/Classes/ComObscureTicarouselModule.m b/mobile/ios/Classes/ComObscureTicarouselModule.m old mode 100644 new mode 100755 index c863612..2a55983 --- a/mobile/ios/Classes/ComObscureTicarouselModule.m +++ b/mobile/ios/Classes/ComObscureTicarouselModule.m @@ -38,7 +38,7 @@ -(void)shutdown:(id)sender { #pragma mark Cleanup -(void)dealloc { - [super dealloc]; + /*[super dealloc];*/ } #pragma mark Internal Memory Management diff --git a/mobile/ios/manifest b/mobile/ios/manifest old mode 100644 new mode 100755 index 3ad7090..dfbbcc4 --- 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 @@ -16,3 +16,4 @@ moduleid: com.obscure.ticarousel guid: 2295ea8d-38ef-4786-b48b-b76c27e14fbb platform: iphone minsdk: 2.0.1.GA2 +architectures: armv7 i386 x86_64 arm64 \ No newline at end of file diff --git a/mobile/ios/ticarousel.xcodeproj/project.pbxproj b/mobile/ios/ticarousel.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index a42775a..1db0134 --- a/mobile/ios/ticarousel.xcodeproj/project.pbxproj +++ b/mobile/ios/ticarousel.xcodeproj/project.pbxproj @@ -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,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/ComObscureTicarousel.dst; @@ -308,6 +301,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 i386 x86_64 arm64"; }; name = Debug; }; @@ -316,15 +310,8 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/ComObscureTicarousel.dst; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; @@ -344,6 +331,7 @@ GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; IPHONEOS_DEPLOYMENT_TARGET = 4.0; + "IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 5.1.1; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; @@ -351,6 +339,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 i386 x86_64 arm64"; }; name = Release; }; @@ -358,15 +347,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; + CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/ComObscureTicarousel.dst; @@ -387,7 +370,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 = NO; OTHER_CFLAGS = ( "-DDEBUG", "-DTI_POST_1_2", @@ -399,6 +383,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 i386 x86_64 arm64"; }; name = Debug; }; @@ -407,15 +392,9 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; + CLANG_ENABLE_OBJC_ARC = YES; DSTROOT = /tmp/ComObscureTicarousel.dst; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; @@ -434,13 +413,16 @@ 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; + "IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 6.0; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = ComObscureTicarousel; RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv7 i386 x86_64 arm64"; }; name = Release; }; diff --git a/mobile/ios/titanium.xcconfig b/mobile/ios/titanium.xcconfig old mode 100644 new mode 100755 index be60a7f..280267c --- 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.0.RC //