Merge pull request #102 from iosphere/fix/bundle-version

Ensure 'CFBundleVersion' is set
iosphere · Apr 6, 2019 · e4f025e · e4f025e
2 parents 9e956c2 + d7da16f
commit e4f025e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # <img src="icon.png" align="center" width="40" height="40"> Changelog
 
+## 2.1.2
+
+* Ensure compatibility with Xcode 10.2
+
 ## 2.1.1
 
 * Deprecate social permissions

diff --git a/ISHPermissionKit.podspec b/ISHPermissionKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'ISHPermissionKit'
-  s.version      = '2.1.1'
+  s.version      = '2.1.2'
   s.summary      = 'A polite and unified way of asking for permission on iOS.'
   s.description  = 'This framework provides a unified way of asking for user permissions on iOS. It also
                     provides UI to explain the permission requirements before presenting the system

diff --git a/ISHPermissionKit.xcodeproj/project.pbxproj b/ISHPermissionKit.xcodeproj/project.pbxproj
@@ -470,7 +470,7 @@
 		DCC1BF9C195B174200362559 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "iosphere GmbH";
 				TargetAttributes = {
 					DCAEF7C9195C60070074EB5B = {
@@ -487,10 +487,11 @@
 			};
 			buildConfigurationList = DCC1BF9F195B174200362559 /* Build configuration list for PBXProject "ISHPermissionKit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = DCC1BF9B195B174200362559;
 			productRefGroup = DCC1BFA6195B174200362559 /* Products */;
@@ -598,6 +599,7 @@
 			baseConfigurationReference = 1BDB4D881DAD4DB00046E4E5 /* ISHPermissionKitFlagsCoverage.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -626,7 +628,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -647,7 +649,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ISH_BUNDLE_VERSION_MAJOR = 2;
 				ISH_BUNDLE_VERSION_MINOR = 1;
-				ISH_BUNDLE_VERSION_PATCH = 1;
+				ISH_BUNDLE_VERSION_PATCH = 2;
 				ISH_BUNDLE_VERSION_SHORT = "${ISH_BUNDLE_VERSION_MAJOR}.${ISH_BUNDLE_VERSION_MINOR}.${ISH_BUNDLE_VERSION_PATCH}";
 				METAL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -662,7 +664,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_CURRENT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
@@ -680,7 +681,6 @@
 		1BDB4D861DAD4D850046E4E5 /* Coverage */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_COMPATIBILITY_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_CURRENT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				FRAMEWORK_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
@@ -707,7 +707,6 @@
 		DCAEF7DC195C60070074EB5B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_COMPATIBILITY_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_CURRENT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				FRAMEWORK_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
@@ -722,7 +721,6 @@
 		DCAEF7DD195C60070074EB5B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_COMPATIBILITY_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_CURRENT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				FRAMEWORK_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
@@ -739,6 +737,7 @@
 			baseConfigurationReference = 1B7221721DA3DD7B00B9266F /* ISHPermissionKitFlags.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -767,7 +766,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -788,7 +787,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ISH_BUNDLE_VERSION_MAJOR = 2;
 				ISH_BUNDLE_VERSION_MINOR = 1;
-				ISH_BUNDLE_VERSION_PATCH = 1;
+				ISH_BUNDLE_VERSION_PATCH = 2;
 				ISH_BUNDLE_VERSION_SHORT = "${ISH_BUNDLE_VERSION_MAJOR}.${ISH_BUNDLE_VERSION_MINOR}.${ISH_BUNDLE_VERSION_PATCH}";
 				METAL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -804,6 +803,7 @@
 			baseConfigurationReference = 1B7221721DA3DD7B00B9266F /* ISHPermissionKitFlags.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -832,7 +832,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -846,7 +846,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ISH_BUNDLE_VERSION_MAJOR = 2;
 				ISH_BUNDLE_VERSION_MINOR = 1;
-				ISH_BUNDLE_VERSION_PATCH = 1;
+				ISH_BUNDLE_VERSION_PATCH = 2;
 				ISH_BUNDLE_VERSION_SHORT = "${ISH_BUNDLE_VERSION_MAJOR}.${ISH_BUNDLE_VERSION_MINOR}.${ISH_BUNDLE_VERSION_PATCH}";
 				METAL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@@ -861,7 +861,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_CURRENT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
@@ -880,7 +879,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";
 				DYLIB_CURRENT_VERSION = "${ISH_BUNDLE_VERSION_SHORT}";

diff --git a/ISHPermissionKit.xcodeproj/xcshareddata/xcschemes/ISHPermissionKit.xcscheme b/ISHPermissionKit.xcodeproj/xcshareddata/xcschemes/ISHPermissionKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ISHPermissionKit.xcodeproj/xcshareddata/xcschemes/ISHPermissionKitLib.xcscheme b/ISHPermissionKit.xcodeproj/xcshareddata/xcschemes/ISHPermissionKitLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ISHPermissionKit/Info.plist b/ISHPermissionKit/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>${ISH_BUNDLE_VERSION}</string>
+	<string>${CURRENT_PROJECT_VERSION}</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>