From b704b01cf3995f69a005e53e1b4e72783313cae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= Date: Sun, 7 May 2017 15:22:59 +0200 Subject: [PATCH] Update changelog and versions, reformat iOS --- android/documentation/changelog.md | 4 +-- android/manifest | 4 +-- ios/Classes/TiImagefactoryModule.m | 41 ++++------------------ ios/documentation/changelog.md | 2 +- ios/imagefactory.xcodeproj/project.pbxproj | 30 +++++++++++++++- ios/titanium.xcconfig | 2 +- 6 files changed, 42 insertions(+), 41 deletions(-) diff --git a/android/documentation/changelog.md b/android/documentation/changelog.md index e282caf..f04de74 100644 --- a/android/documentation/changelog.md +++ b/android/documentation/changelog.md @@ -1,8 +1,8 @@ # Change Log 
-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
index 42c79ed..0606b25 100644
--- 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
index 2533f67..075c7cf 100644
--- 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
index 39ffef5..eb9f849 100644
--- a/ios/documentation/changelog.md
+++ b/ios/documentation/changelog.md
@@ -1,6 +1,6 @@
 # Change Log
 
-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
index f0fcb32..e276de8 100644
--- 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,10 +347,21 @@
 					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;
@@ -358,10 +369,13 @@
 				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
index 6208335..23ddd48 100644
--- 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
 
 
 //