diff --git a/.gitignore b/.gitignore index a606ca9..f6474e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,26 @@ +.DS_Store tmp bin build +dist +Index *.zip +*/*/modules +*/*/modules* +.apt_generated +build.properties +.svn +.settings +*.pyc +*~.nib/ +*.pbxuser +*.perspective +*.perspectivev3 +*.xcworkspace/ +xcuserdata +*.xcuserstate +*.xcuserdata* +DerivedData/ + +.idea/ +libs/ \ No newline at end of file diff --git a/Classes/ItSmcDakeyboardcontrolModuleAssets.m b/Classes/ItSmcDakeyboardcontrolModuleAssets.m index d5edff1..3c35204 100644 --- a/Classes/ItSmcDakeyboardcontrolModuleAssets.m +++ b/Classes/ItSmcDakeyboardcontrolModuleAssets.m @@ -1,40 +1,24 @@ /** - * Copyright (c) 2014 SMC Treviso s.r.l. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * Appcelerator Titanium is Copyright (c) 2009-2010 by Appcelerator, Inc. - * and licensed under the Apache Public License (version 2) + * This is a generated file. Do not edit or your changes will be lost */ - #import "ItSmcDakeyboardcontrolModuleAssets.h" extern NSData* filterDataInRange(NSData* thedata, NSRange range); @implementation ItSmcDakeyboardcontrolModuleAssets -- (NSData*) moduleAsset +- (NSData *)moduleAsset { - //##TI_AUTOGEN_BEGIN asset - //Compiler generates code for asset here - return nil; // DEFAULT BEHAVIOR - //##TI_AUTOGEN_END asset + + + return nil; } -- (NSData*) resolveModuleAsset:(NSString*)path +- (NSData *)resolveModuleAsset:(NSString *)path { - //##TI_AUTOGEN_BEGIN resolve_asset - //Compiler generates code for asset resolution here - return nil; // DEFAULT BEHAVIOR - //##TI_AUTOGEN_END resolve_asset + + + return nil; } @end diff --git a/TiDAKeyboardControl.xcodeproj/project.pbxproj b/TiDAKeyboardControl.xcodeproj/project.pbxproj index 87905e8..46d82b7 100644 --- a/TiDAKeyboardControl.xcodeproj/project.pbxproj +++ b/TiDAKeyboardControl.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -26,8 +26,8 @@ 24DD6CFA1134B3F500162E58 /* ItSmcDakeyboardcontrolModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* ItSmcDakeyboardcontrolModule.m */; }; 24DE9E1111C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DE9E0F11C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.h */; }; 24DE9E1211C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DE9E1011C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.m */; }; - 96C68C141897A4F7005FEC06 /* DAKeyboardControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 96C68C121897A4F7005FEC06 /* DAKeyboardControl.h */; }; - 96C68C151897A4F7005FEC06 /* DAKeyboardControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 96C68C131897A4F7005FEC06 /* DAKeyboardControl.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 74C235882A45C38400BC69CB /* DAKeyboardControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 74C235862A45C38400BC69CB /* DAKeyboardControl.h */; }; + 74C235892A45C38400BC69CB /* DAKeyboardControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 74C235872A45C38400BC69CB /* DAKeyboardControl.m */; }; 96C68C181897A645005FEC06 /* TiViewProxy+KeyboardControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 96C68C161897A645005FEC06 /* TiViewProxy+KeyboardControl.h */; }; 96C68C191897A645005FEC06 /* TiViewProxy+KeyboardControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 96C68C171897A645005FEC06 /* TiViewProxy+KeyboardControl.m */; }; AA747D9F0F9514B9006C5449 /* ItSmcDakeyboardcontrol_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* ItSmcDakeyboardcontrol_Prefix.pch */; }; @@ -50,8 +50,8 @@ 24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = ""; }; 24DE9E0F11C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ItSmcDakeyboardcontrolModuleAssets.h; path = Classes/ItSmcDakeyboardcontrolModuleAssets.h; sourceTree = ""; }; 24DE9E1011C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ItSmcDakeyboardcontrolModuleAssets.m; path = Classes/ItSmcDakeyboardcontrolModuleAssets.m; sourceTree = ""; }; - 96C68C121897A4F7005FEC06 /* DAKeyboardControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAKeyboardControl.h; sourceTree = ""; }; - 96C68C131897A4F7005FEC06 /* DAKeyboardControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DAKeyboardControl.m; sourceTree = ""; }; + 74C235862A45C38400BC69CB /* DAKeyboardControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAKeyboardControl.h; sourceTree = ""; }; + 74C235872A45C38400BC69CB /* DAKeyboardControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DAKeyboardControl.m; sourceTree = ""; }; 96C68C161897A645005FEC06 /* TiViewProxy+KeyboardControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "TiViewProxy+KeyboardControl.h"; path = "Classes/TiViewProxy+KeyboardControl.h"; sourceTree = ""; }; 96C68C171897A645005FEC06 /* TiViewProxy+KeyboardControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "TiViewProxy+KeyboardControl.m"; path = "Classes/TiViewProxy+KeyboardControl.m"; sourceTree = ""; }; AA747D9E0F9514B9006C5449 /* ItSmcDakeyboardcontrol_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ItSmcDakeyboardcontrol_Prefix.pch; sourceTree = SOURCE_ROOT; }; @@ -124,8 +124,8 @@ 96C68C111897A4F7005FEC06 /* DAKeyboardControl */ = { isa = PBXGroup; children = ( - 96C68C121897A4F7005FEC06 /* DAKeyboardControl.h */, - 96C68C131897A4F7005FEC06 /* DAKeyboardControl.m */, + 74C235862A45C38400BC69CB /* DAKeyboardControl.h */, + 74C235872A45C38400BC69CB /* DAKeyboardControl.m */, ); name = DAKeyboardControl; path = DAKeyboardControl/DAKeyboardControl; @@ -138,9 +138,9 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 96C68C141897A4F7005FEC06 /* DAKeyboardControl.h in Headers */, 96C68C181897A645005FEC06 /* TiViewProxy+KeyboardControl.h in Headers */, AA747D9F0F9514B9006C5449 /* ItSmcDakeyboardcontrol_Prefix.pch in Headers */, + 74C235882A45C38400BC69CB /* DAKeyboardControl.h in Headers */, 24DD6CF91134B3F500162E58 /* ItSmcDakeyboardcontrolModule.h in Headers */, 24DE9E1111C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.h in Headers */, ); @@ -172,10 +172,11 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "TiDAKeyboardControl" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 12.0"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -217,7 +218,7 @@ buildActionMask = 2147483647; files = ( 24DD6CFA1134B3F500162E58 /* ItSmcDakeyboardcontrolModule.m in Sources */, - 96C68C151897A4F7005FEC06 /* DAKeyboardControl.m in Sources */, + 74C235892A45C38400BC69CB /* DAKeyboardControl.m in Sources */, 24DE9E1211C5FE74003F90F6 /* ItSmcDakeyboardcontrolModuleAssets.m in Sources */, 96C68C191897A645005FEC06 /* TiViewProxy+KeyboardControl.m in Sources */, ); @@ -238,6 +239,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/ItSmcDakeyboardcontrol.dst; @@ -277,6 +280,7 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_WEAK = YES; DSTROOT = /tmp/ItSmcDakeyboardcontrol.dst; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; @@ -294,7 +298,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; @@ -309,26 +313,52 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = 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/ItSmcDakeyboardcontrol.dst; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ItSmcDakeyboardcontrol_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; 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; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DDEBUG", @@ -349,24 +379,48 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DSTROOT = /tmp/ItSmcDakeyboardcontrol.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 = ItSmcDakeyboardcontrol_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; 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; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = ItSmcDakeyboardcontrol; @@ -380,6 +434,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -391,9 +446,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = "Build & test"; ZERO_LINK = NO; }; diff --git a/manifest b/manifest index 1c6c5de..495a1e8 100644 --- a/manifest +++ b/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 0.4.0 +version: 0.5.0 apiversion: 2 description: TiDAKeyboardControl offers some advanced behaviour for the keyboard in Titanium SDK, kudos to @danielamitay author: Pier Paolo Ramon @@ -15,5 +15,6 @@ name: TiDAKeyboardControl moduleid: it.smc.dakeyboardcontrol guid: 1d7767b0-9492-466b-ac7d-7a0d593eec42 platform: iphone -architectures: armv7 arm64 i386 x86_64 -minsdk: 3.5.0.GA +architectures: arm64 x86_64 +mac: false +minsdk: 11.0.0 diff --git a/metadata.json b/metadata.json new file mode 100644 index 0000000..43a62e5 --- /dev/null +++ b/metadata.json @@ -0,0 +1 @@ +{"exports":[]} \ No newline at end of file diff --git a/titanium.xcconfig b/titanium.xcconfig index e1b0ef4..41bcdcd 100644 --- a/titanium.xcconfig +++ b/titanium.xcconfig @@ -4,16 +4,11 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 3.2.0.GA +TITANIUM_SDK_VERSION = 11.0.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/$(USER)/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION) +HEADER_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/include" +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/Frameworks/**" \ No newline at end of file