diff --git a/SRGAppearance-bundle/Info.plist b/Framework/Resources/Info.plist
similarity index 60%
rename from SRGAppearance-bundle/Info.plist
rename to Framework/Resources/Info.plist
index 44584db..1f571be 100644
--- a/SRGAppearance-bundle/Info.plist
+++ b/Framework/Resources/Info.plist
@@ -3,24 +3,18 @@
CFBundleDevelopmentRegion
- $(DEVELOPMENT_LANGUAGE)
- CFBundleExecutable
- $(EXECUTABLE_NAME)
+ en
CFBundleIdentifier
$(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- $(PRODUCT_NAME)
+ ${PRODUCT_NAME}
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 1.0
+ $(MARKETING_VERSION)
CFBundleVersion
- 1
- NSHumanReadableCopyright
- Copyright © 2018 SRG SSR. All rights reserved.
- NSPrincipalClass
-
+ $(CURRENT_PROJECT_VERSION)
diff --git a/SRGAppearance.xcodeproj/project.pbxproj b/SRGAppearance.xcodeproj/project.pbxproj
index 88dea16..0f34592 100644
--- a/SRGAppearance.xcodeproj/project.pbxproj
+++ b/SRGAppearance.xcodeproj/project.pbxproj
@@ -114,6 +114,7 @@
6FE08CDA1E8AA8E300EC4716 /* BundleFix.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BundleFix.m; sourceTree = ""; };
6FE08CDD1E8AA9D100EC4716 /* FontAwesome.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.otf; sourceTree = ""; };
6FE08CDF1E8AAB8F00EC4716 /* Corrupt.otf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Corrupt.otf; sourceTree = ""; };
+ 6FE6E5DE2148D84200228573 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
6FE89DD01EBD024200CE3069 /* TestImage.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = TestImage.pdf; sourceTree = ""; };
/* End PBXFileReference section */
@@ -226,6 +227,7 @@
isa = PBXGroup;
children = (
6FE08C591E8A83EF00EC4716 /* Fonts */,
+ 6FE6E5DE2148D84200228573 /* Info.plist */,
);
path = Resources;
sourceTree = "";
@@ -579,6 +581,7 @@
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
+ DYLIB_CURRENT_VERSION = 1;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -596,13 +599,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- MARKETING_VERSION = 1.1.6;
+ MARKETING_VERSION = 1.1.7;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
- VERSIONING_SYSTEM = "apple-generic";
- VERSION_INFO_PREFIX = "";
};
name = "Debug-static";
};
@@ -614,7 +615,6 @@
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -625,6 +625,7 @@
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
+ VERSIONING_SYSTEM = "apple-generic";
};
name = "Debug-static";
};
@@ -685,6 +686,7 @@
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DYLIB_CURRENT_VERSION = 1;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -696,13 +698,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- MARKETING_VERSION = 1.1.6;
+ MARKETING_VERSION = 1.1.7;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
- VERSIONING_SYSTEM = "apple-generic";
- VERSION_INFO_PREFIX = "";
};
name = "Release-static";
};
@@ -714,7 +714,6 @@
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -724,6 +723,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
+ VERSIONING_SYSTEM = "apple-generic";
};
name = "Release-static";
};
@@ -757,9 +757,8 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
- ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
- INFOPLIST_FILE = Framework/Info.plist;
+ INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAppearance-resources";
PRODUCT_NAME = SRGAppearance;
@@ -776,9 +775,8 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
- ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
- INFOPLIST_FILE = Framework/Info.plist;
+ INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAppearance-resources";
PRODUCT_NAME = SRGAppearance;
@@ -795,9 +793,8 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
- ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
- INFOPLIST_FILE = Framework/Info.plist;
+ INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAppearance-resources";
PRODUCT_NAME = SRGAppearance;
@@ -814,9 +811,8 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
- ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
- INFOPLIST_FILE = Framework/Info.plist;
+ INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAppearance-resources";
PRODUCT_NAME = SRGAppearance;
@@ -860,6 +856,7 @@
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
+ DYLIB_CURRENT_VERSION = 1;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -877,13 +874,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- MARKETING_VERSION = 1.1.6;
+ MARKETING_VERSION = 1.1.7;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
- VERSIONING_SYSTEM = "apple-generic";
- VERSION_INFO_PREFIX = "";
};
name = Debug;
};
@@ -922,6 +917,7 @@
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DYLIB_CURRENT_VERSION = 1;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -933,13 +929,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
- MARKETING_VERSION = 1.1.6;
+ MARKETING_VERSION = 1.1.7;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
- VERSIONING_SYSTEM = "apple-generic";
- VERSION_INFO_PREFIX = "";
};
name = Release;
};
@@ -950,7 +944,6 @@
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -960,6 +953,7 @@
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
+ VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
};
@@ -970,7 +964,6 @@
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -979,6 +972,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
+ VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
};