Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@defagos
defagos committed Sep 12, 2018
2 parents a487b91 + be758c3 commit e3f3f6c
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgnetwork-ios" "0.1"
github "SRGSSR/srgnetwork-ios" "0.2"
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgnetwork-ios" "0.1"
github "SRGSSR/srgnetwork-ios" "0.2"
20 changes: 20 additions & 0 deletions Framework/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Framework/Resources/rm.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"This content is protected and cannot be played without proper rights." = "Il cuntegn è protegì e na po betg vegnì consuma senza ils dretgs necessaris.";

/* User-facing message displayed when an error related to digital rights management (DRM) has been encountered, and inviting the user to contact customer support */
"This content is protected and cannot be played without proper rights. Contact customer support for further help." = "Il cuntegn è protegì e na po betg vegnì consuma senza ils dretgs necessaris.";
"This content is protected and cannot be played without proper rights. Contact customer support for further help." = "Il cuntegn è protegì e na po betg vegnì consuma senza ils dretgs necessaris. Per ulteriuras infurmaziuns contactai [email protected]";
40 changes: 15 additions & 25 deletions SRGContentProtection.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
6FDE576320FC9DC700719525 /* SRGContentProtectionError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRGContentProtectionError.m; sourceTree = "<group>"; };
6FDE576420FC9DC700719525 /* SRGContentProtectionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGContentProtectionError.h; sourceTree = "<group>"; };
6FE021DC2119B58800DF6617 /* SRGAssetResourceLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAssetResourceLoaderDelegate.h; sourceTree = "<group>"; };
6FE6E5E32148DC1D00228573 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -178,8 +179,8 @@
6F0EB53C20FC7FA9009C02CF /* Framework */,
6FB74D722101D5D600E2D365 /* Tests */,
6F8A93EE20FDCAA800AA6434 /* Demo */,
6F0EB53220FC7F58009C02CF /* Products */,
6F8A945521006A9E00AA6434 /* Frameworks */,
6F0EB53220FC7F58009C02CF /* Products */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -309,6 +310,7 @@
isa = PBXGroup;
children = (
6FCBFEF7210B578B006BC355 /* Localizable.strings */,
6FE6E5E32148DC1D00228573 /* Info.plist */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -637,13 +639,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.1;
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";
};
Expand All @@ -656,7 +656,6 @@
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -674,6 +673,7 @@
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGContentProtection;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Debug-static";
};
Expand Down Expand Up @@ -765,13 +765,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.1;
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";
};
Expand All @@ -784,7 +782,6 @@
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -802,6 +799,7 @@
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGContentProtection;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Release-static";
};
Expand Down Expand Up @@ -849,8 +847,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGContentProtection-resources";
PRODUCT_NAME = SRGContentProtection;
Expand All @@ -864,8 +861,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGContentProtection-resources";
PRODUCT_NAME = SRGContentProtection;
Expand All @@ -879,8 +875,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGContentProtection-resources";
PRODUCT_NAME = SRGContentProtection;
Expand All @@ -894,8 +889,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGContentProtection-resources";
PRODUCT_NAME = SRGContentProtection;
Expand Down Expand Up @@ -959,13 +953,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.1;
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;
};
Expand Down Expand Up @@ -1018,13 +1010,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.1;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
Expand All @@ -1036,7 +1026,6 @@
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1052,6 +1041,7 @@
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGContentProtection;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
};
Expand All @@ -1063,7 +1053,6 @@
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1079,6 +1068,7 @@
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGContentProtection;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
};
Expand Down

0 comments on commit e3f3f6c

Please sign in to comment.