Commit 90cf5e96 authored by Carola Nitz's avatar Carola Nitz

Add icon sizes for Xcode 9 and add armv7k as valid arch for compilation to include watch device

parent 86d2f8c8
......@@ -113,14 +113,14 @@ post_install do |installer_representation|
installer_representation.pods_project.build_configurations.each do |config|
config.build_settings['SKIP_INSTALL'] = 'YES'
config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64 i386'
config.build_settings['ARCHS'] = 'armv7 armv7s arm64 i386'
config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64 i386 armv7k'
config.build_settings['ARCHS'] = 'armv7 armv7s arm64 i386 armv7k'
end
else
installer_representation.pods_project.build_configurations.each do |config|
config.build_settings['SKIP_INSTALL'] = 'YES'
config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64 i386'
config.build_settings['ARCHS'] = 'armv7 armv7s arm64 i386'
config.build_settings['VALID_ARCHS'] = 'armv7 armv7s arm64 i386 armv7k'
config.build_settings['ARCHS'] = 'armv7 armv7s arm64 i386 armv7k'
config.build_settings['CLANG_CXX_LIBRARY'] = 'libc++'
end
end
......
......@@ -140,6 +140,6 @@ SPEC CHECKSUMS:
XKKeychain: 852ef663c56a7194c73d3c68e8d9d4f07b121d4f
xmlrpc: 109bb21d15ed6d108b2c1ac5973a6a223a50f5f4
PODFILE CHECKSUM: 2cb39ce6359da39b253d218c4a40d4d1c2561648
PODFILE CHECKSUM: a392cb02693a6122b011a59e24dceceb8e4f4424
COCOAPODS: 1.3.0
......@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
00A95040EE11653E59CB2F56 /* libPods-VLC-watchOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FF73F10D7535681155A87975 /* libPods-VLC-watchOS.a */; };
1D72DC00CD4A06E8789BD8F7 /* libPods-VLC-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FE1DEC7096649D63A308D86C /* libPods-VLC-tvOS.a */; };
2678432A1D3D5B9500BF36EE /* VLCNetworkLoginViewFieldCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = DDF908DB1CF4CEE700108B70 /* VLCNetworkLoginViewFieldCell.xib */; };
26D2F0651D3D3CC8003F7417 /* VLCNetworkLoginDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD846BDE1D1FCCCD00699D17 /* VLCNetworkLoginDataSource.m */; };
......@@ -1167,7 +1166,6 @@
6B4E33CF1BF2A39400A35255 /* playerControl.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = playerControl.css; path = Resources/web/playerControl.css; sourceTree = SOURCE_ROOT; };
6B4E33D01BF2A39400A35255 /* playerControl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = playerControl.js; path = Resources/web/playerControl.js; sourceTree = SOURCE_ROOT; };
6FB3C4D1992DBF2B53F985CE /* libPods-VLC-tvOS-Debug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VLC-tvOS-Debug.a"; sourceTree = BUILT_PRODUCTS_DIR; };
70AEC88A7DDC105B2C5FF02B /* Pods-VLC-watchOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VLC-watchOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-VLC-watchOS/Pods-VLC-watchOS.release.xcconfig"; sourceTree = "<group>"; };
7AC8629B1765DC560011611A /* style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = style.css; sourceTree = "<group>"; };
7AC8629E1765E90C0011611A /* jquery-1.10.1.min.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "jquery-1.10.1.min.js"; sourceTree = "<group>"; };
7AC8629F1765E90C0011611A /* jquery.fileupload.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jquery.fileupload.js; sourceTree = "<group>"; };
......@@ -1785,8 +1783,6 @@
E579A52AEDA803047C751011 /* Pods-VLC-iOS-no-watch-Debug.distribution.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VLC-iOS-no-watch-Debug.distribution.xcconfig"; path = "Pods/Target Support Files/Pods-VLC-iOS-no-watch-Debug/Pods-VLC-iOS-no-watch-Debug.distribution.xcconfig"; sourceTree = "<group>"; };
EA4CCE915F660D75AB23F0E7 /* Pods-VLC-iOS-Debug.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VLC-iOS-Debug.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VLC-iOS-Debug/Pods-VLC-iOS-Debug.debug.xcconfig"; sourceTree = "<group>"; };
F25DF68DCD1A8FA89D1933B3 /* Pods-VLC-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VLC-tvOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VLC-tvOS/Pods-VLC-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
F68821DE843F44FE5F36444C /* Pods-VLC-watchOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VLC-watchOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VLC-watchOS/Pods-VLC-watchOS.debug.xcconfig"; sourceTree = "<group>"; };
F7CB1447CFBE473B45EB3BCB /* Pods-VLC-watchOS.distribution.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VLC-watchOS.distribution.xcconfig"; path = "Pods/Target Support Files/Pods-VLC-watchOS/Pods-VLC-watchOS.distribution.xcconfig"; sourceTree = "<group>"; };
F99C6A3A1B6B1C77D41D4172 /* Pods-VLC-tvOS-Debug.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VLC-tvOS-Debug.release.xcconfig"; path = "Pods/Target Support Files/Pods-VLC-tvOS-Debug/Pods-VLC-tvOS-Debug.release.xcconfig"; sourceTree = "<group>"; };
FE1DEC7096649D63A308D86C /* libPods-VLC-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VLC-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
FF73F10D7535681155A87975 /* libPods-VLC-watchOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VLC-watchOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -1937,7 +1933,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
00A95040EE11653E59CB2F56 /* libPods-VLC-watchOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -2849,9 +2844,6 @@
633AEC92459BCABEC8671A34 /* Pods-VLC-tvOS-Debug.debug.xcconfig */,
F99C6A3A1B6B1C77D41D4172 /* Pods-VLC-tvOS-Debug.release.xcconfig */,
8C707B9BB2C5681D50CC9B99 /* Pods-VLC-tvOS-Debug.distribution.xcconfig */,
F68821DE843F44FE5F36444C /* Pods-VLC-watchOS.debug.xcconfig */,
70AEC88A7DDC105B2C5FF02B /* Pods-VLC-watchOS.release.xcconfig */,
F7CB1447CFBE473B45EB3BCB /* Pods-VLC-watchOS.distribution.xcconfig */,
4EB2A836EBC6DE6E89855975 /* Pods-VLC-watchOS-Extension.debug.xcconfig */,
D2711C77E8DF23DB7347ADC9 /* Pods-VLC-watchOS-Extension.release.xcconfig */,
2CD27DA5256F95F3B8594C53 /* Pods-VLC-watchOS-Extension.distribution.xcconfig */,
......@@ -3321,11 +3313,9 @@
isa = PBXNativeTarget;
buildConfigurationList = DD3567871B6760BF00338947 /* Build configuration list for PBXNativeTarget "VLC-watchOS" */;
buildPhases = (
8740D3184546E03E4DEB75FD /* [CP] Check Pods Manifest.lock */,
DD3567621B6760BF00338947 /* Resources */,
DD3567861B6760BF00338947 /* Embed App Extensions */,
CE42178D31A8866534B95F77 /* Frameworks */,
224E640832A47AB902A1BD2A /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -3881,25 +3871,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VLC-tvOS/Pods-VLC-tvOS-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
224E640832A47AB902A1BD2A /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-VLC-watchOS/Pods-VLC-watchOS-resources.sh",
"${PODS_ROOT}/MediaLibraryKit-unstable/MappingModel_2_5_to_2_6.xcmappingmodel",
"${PODS_ROOT}/MediaLibraryKit-unstable/MediaLibrary.xcdatamodeld",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VLC-watchOS/Pods-VLC-watchOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
23B425DEB65EA5C88D873ED2 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
......@@ -4095,24 +4066,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VLC-tvOS-Debug/Pods-VLC-tvOS-Debug-resources.sh\"\n";
showEnvVarsInLog = 0;
};
8740D3184546E03E4DEB75FD /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-VLC-watchOS-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
9706D52A0CDF446E336826A6 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
......@@ -5902,7 +5855,6 @@
};
DD35677F1B6760BF00338947 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F68821DE843F44FE5F36444C /* Pods-VLC-watchOS.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
......@@ -5940,7 +5892,6 @@
};
DD3567801B6760BF00338947 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 70AEC88A7DDC105B2C5FF02B /* Pods-VLC-watchOS.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
......@@ -5978,7 +5929,6 @@
};
DD3567811B6760BF00338947 /* Distribution */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F7CB1447CFBE473B45EB3BCB /* Pods-VLC-watchOS.distribution.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
......@@ -6045,12 +5995,13 @@
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER_PREFIX}.vlc-ios.watchkitapp.wkextension";
PRODUCT_NAME = "${TARGET_NAME}";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "VLC WatchKit Native Extension/VLC WatchKit Extension-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = 4;
VALID_ARCHS = "arm64 armv7 armv7s i386";
VALID_ARCHS = "arm64 armv7 armv7s i386 armv7k";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Debug;
......@@ -6086,12 +6037,13 @@
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER_PREFIX}.vlc-ios.watchkitapp.wkextension";
PRODUCT_NAME = "${TARGET_NAME}";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "1762d06b-c802-4d52-9713-5868ef7d3991";
PROVISIONING_PROFILE_SPECIFIER = "org.videolan.vlc-ios.watchkitapp.wkextension AppStore 1502467243";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "VLC WatchKit Native Extension/VLC WatchKit Extension-Bridging-Header.h";
TARGETED_DEVICE_FAMILY = 4;
VALID_ARCHS = "arm64 armv7 armv7s i386";
VALID_ARCHS = "arm64 armv7 armv7s i386 armv7k";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Release;
......@@ -6132,7 +6084,7 @@
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "VLC WatchKit Native Extension/VLC WatchKit Extension-Bridging-Header.h";
TARGETED_DEVICE_FAMILY = 4;
VALID_ARCHS = "arm64 armv7 armv7s i386";
VALID_ARCHS = "arm64 armv7 armv7s i386 armv7k";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Distribution;
......
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "AppIcon20@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "AppIcon20@3x.png",
"scale" : "3x"
},
{
......@@ -47,13 +49,15 @@
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"idiom" : "ipad",
"filename" : "AppIcon20@1x.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"idiom" : "ipad",
"filename" : "AppIcon20@2x-1.png",
"scale" : "2x"
},
{
......@@ -95,9 +99,15 @@
{
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "AppIcon83.5x83.5@2x.png",
"filename" : "AppIcon83.5@2x.jpg",
"scale" : "2x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "AppIcon1024x1024.png",
"scale" : "1x"
},
{
"size" : "24x24",
"idiom" : "watch",
......@@ -159,6 +169,12 @@
"scale" : "2x",
"role" : "quickLook",
"subtype" : "42mm"
},
{
"size" : "1024x1024",
"idiom" : "watch-marketing",
"filename" : "AppIcon1024@1x.png",
"scale" : "1x"
}
],
"info" : {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment