Merge pull request #29 from hansemannn/update-repo

hansemannn · web-flow · commit e40ec1f9a3f1 · 2017-05-07T15:23:36.000+02:00
Update changelog and versions, reformat iOS
diff --git a/android/documentation/changelog.md b/android/documentation/changelog.md
@@ -1,8 +1,8 @@
 # Change Log
 <pre>
-v2.3.1 Fixed images not being recycled properly.
+v3.1.0  Added image rotation functionality, fixed images not being recycled properly.
 
-v2.3.0 Added image rotation functionality.
+v3.0.0  Rebuild module for SDK 6+ compatibility
 
 v2.2.2	[MOD-2166] Recompiled module to solve crashes in Android 6.0
 
diff --git a/android/manifest b/android/manifest
@@ -2,13 +2,13 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.0.0
+version: 3.1.0
 apiversion: 3
 architectures: armeabi-v7a x86
 description: Image Factory
 author: Jeff English
 license: Apache License, Version 2.0
-copyright: Copyright (c) 2013-2016 by Appcelerator,  Inc.
+copyright: Copyright (c) 2013-2017 by Appcelerator,  Inc.
 
 
 # these should not be edited
diff --git a/ios/Classes/TiImagefactoryModule.m b/ios/Classes/TiImagefactoryModule.m
@@ -34,34 +34,7 @@ -(void)startup
 	// you *must* call the superclass
 	[super startup];
 	
-	NSLog(@"[INFO] %@ loaded",self);
-}
-
--(void)shutdown:(id)sender
-{
-	// this method is called when the module is being unloaded
-	// typically this is during shutdown. make sure you don't do too
-	// much processing here or the app will be quit forceably
-	
-	// you *must* call the superclass
-	[super shutdown:sender];
-}
-
-#pragma mark Cleanup 
-
--(void)dealloc
-{
-	// release any resources that have been retained by the module
-	[super dealloc];
-}
-
-#pragma mark Internal Memory Management
-
--(void)didReceiveMemoryWarning:(NSNotification*)notification
-{
-	// optionally release any resources that can be dynamically
-	// reloaded once memory is available - such as caches
-	[super didReceiveMemoryWarning:notification];
+	NSLog(@"[DEBUG] %@ loaded",self);
 }
 
 #pragma system properties
@@ -137,12 +110,12 @@ +(id)imageTransform:(TransformType)type withArgs:(id)args
 
 #pragma mark Public Image Methods
 
--(id)imageWithRotation:(id)args
+- (id)imageWithRotation:(id)args
 {
     return [TiImagefactoryModule imageTransform:kTransformRotate withArgs:args];
 }
 
--(id)imageWithAlpha:(id)args
+- (id)imageWithAlpha:(id)args
 {
 	return [TiImagefactoryModule imageTransform:kTransformAlpha withArgs:args];
 }
@@ -161,17 +134,17 @@ - (id)imageAsThumbnail:(id)args
 {
 	return [TiImagefactoryModule imageTransform:kTransformThumbnail withArgs:args];}
 
--(id)imageAsResized:(id)args
+- (id)imageAsResized:(id)args
 {
 	return [TiImagefactoryModule imageTransform:kTransformResize withArgs:args];
 }
 
--(id)imageAsCropped:(id)args
+- (id)imageAsCropped:(id)args
 {
 	return [TiImagefactoryModule imageTransform:kTransformCrop withArgs:args];
 }
 
--(id)imageTransform:(id)args
+- (id)imageTransform:(id)args
 {
 	enum Args {
 		kArgBlob = 0,
@@ -196,7 +169,7 @@ -(id)imageTransform:(id)args
 	return image ? [[[TiBlob alloc] initWithImage:image] autorelease] : nil;
 }
 
--(id)compress:(id)args
+- (id)compress:(id)args
 {
 	enum Args {
 		kArgBlob = 0,
diff --git a/ios/documentation/changelog.md b/ios/documentation/changelog.md
@@ -1,6 +1,6 @@
 # Change Log
 <pre>
-v1.3.0 Added image rotation functionality.
+v1.3.0  Added image rotation functionality.
 
 v1.2.0  [TIMOB-18092] Updated to build for 64bit
 
diff --git a/ios/imagefactory.xcodeproj/project.pbxproj b/ios/imagefactory.xcodeproj/project.pbxproj
@@ -193,7 +193,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0830;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "imagefactory" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -347,21 +347,35 @@
 					i386,
 					x86_64,
 				);
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DSTROOT = /tmp/TiImagefactory.dst;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = TiImagefactory_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = NO;
 				GCC_WARN_MISSING_PARENTHESES = NO;
 				GCC_WARN_SHADOW = NO;
 				GCC_WARN_STRICT_SELECTOR_MATCH = NO;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_PARAMETER = NO;
 				GCC_WARN_UNUSED_VALUE = NO;
@@ -394,19 +408,33 @@
 					i386,
 					x86_64,
 				);
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DSTROOT = /tmp/TiImagefactory.dst;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_MODEL_TUNING = G5;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = TiImagefactory_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = NO;
 				GCC_WARN_MISSING_PARENTHESES = NO;
 				GCC_WARN_SHADOW = NO;
 				GCC_WARN_STRICT_SELECTOR_MATCH = NO;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_PARAMETER = NO;
 				GCC_WARN_UNUSED_VALUE = NO;
diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig
@@ -4,7 +4,7 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 6.0.1.GA
+TITANIUM_SDK_VERSION = 6.0.4.GA
 
 
 // 

Original file line number	Diff line number	Diff line change
`@@ -34,34 +34,7 @@ -(void)startup`
`34`	`34`	`// you must call the superclass`
`35`	`35`	`[super startup];`
`36`	`36`
`37`		`- NSLog(@"[INFO] %@ loaded",self);`
`38`		`-}`
`39`		`-`
`40`		`--(void)shutdown:(id)sender`
`41`		`-{`
`42`		`- // this method is called when the module is being unloaded`
`43`		`- // typically this is during shutdown. make sure you don't do too`
`44`		`- // much processing here or the app will be quit forceably`
`45`		`-`
`46`		`- // you must call the superclass`
`47`		`- [super shutdown:sender];`
`48`		`-}`
`49`		`-`
`50`		`-#pragma mark Cleanup`
`51`		`-`
`52`		`--(void)dealloc`
`53`		`-{`
`54`		`- // release any resources that have been retained by the module`
`55`		`- [super dealloc];`
`56`		`-}`
`57`		`-`
`58`		`-#pragma mark Internal Memory Management`
`59`		`-`
`60`		`--(void)didReceiveMemoryWarning:(NSNotification*)notification`
`61`		`-{`
`62`		`- // optionally release any resources that can be dynamically`
`63`		`- // reloaded once memory is available - such as caches`
`64`		`- [super didReceiveMemoryWarning:notification];`
	`37`	`+ NSLog(@"[DEBUG] %@ loaded",self);`
`65`	`38`	`}`
`66`	`39`
`67`	`40`	`#pragma system properties`
`@@ -137,12 +110,12 @@ +(id)imageTransform:(TransformType)type withArgs:(id)args`
`137`	`110`
`138`	`111`	`#pragma mark Public Image Methods`
`139`	`112`
`140`		`--(id)imageWithRotation:(id)args`
	`113`	`+- (id)imageWithRotation:(id)args`
`141`	`114`	`{`
`142`	`115`	`return [TiImagefactoryModule imageTransform:kTransformRotate withArgs:args];`
`143`	`116`	`}`
`144`	`117`
`145`		`--(id)imageWithAlpha:(id)args`
	`118`	`+- (id)imageWithAlpha:(id)args`
`146`	`119`	`{`
`147`	`120`	`return [TiImagefactoryModule imageTransform:kTransformAlpha withArgs:args];`
`148`	`121`	`}`
`@@ -161,17 +134,17 @@ - (id)imageAsThumbnail:(id)args`
`161`	`134`	`{`
`162`	`135`	`return [TiImagefactoryModule imageTransform:kTransformThumbnail withArgs:args];}`
`163`	`136`
`164`		`--(id)imageAsResized:(id)args`
	`137`	`+- (id)imageAsResized:(id)args`
`165`	`138`	`{`
`166`	`139`	`return [TiImagefactoryModule imageTransform:kTransformResize withArgs:args];`
`167`	`140`	`}`
`168`	`141`
`169`		`--(id)imageAsCropped:(id)args`
	`142`	`+- (id)imageAsCropped:(id)args`
`170`	`143`	`{`
`171`	`144`	`return [TiImagefactoryModule imageTransform:kTransformCrop withArgs:args];`
`172`	`145`	`}`
`173`	`146`
`174`		`--(id)imageTransform:(id)args`
	`147`	`+- (id)imageTransform:(id)args`
`175`	`148`	`{`
`176`	`149`	`enum Args {`
`177`	`150`	`kArgBlob = 0,`
`@@ -196,7 +169,7 @@ -(id)imageTransform:(id)args`
`196`	`169`	`return image ? [[[TiBlob alloc] initWithImage:image] autorelease] : nil;`
`197`	`170`	`}`
`198`	`171`
`199`		`--(id)compress:(id)args`
	`172`	`+- (id)compress:(id)args`
`200`	`173`	`{`
`201`	`174`	`enum Args {`
`202`	`175`	`kArgBlob = 0,`