Skip to content

C
cocoapods
Commit f375b48f authored by Marius Rackwitz's avatar Marius Rackwitz
Browse files
Options

Merge pull request #5049 from CocoaPods/mr-fix-resource-bundles 

[WIP][PodTargetInstaller] Fix build dir for resource bundles
parents 76c358a6 384f05ac
Hide whitespace changes
Inline Side-by-side
Showing with 936 additions and 5 deletions
CHANGELOG.md
View file @ f375b48f
......@@ -29,6 +29,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
file system as result on case insensitive file system.
[Soutaro Matsumoto](https://github.com/soutaro)
* Fix build path for resource bundles.
[Marius Rackwitz](https://github.com/mrackwitz)
[#5034](https://github.com/CocoaPods/CocoaPods/issues/5034)
## 1.0.0.beta.7
......
examples/AFNetworking Example/Podfile
View file @ f375b48f
......@@ -6,12 +6,12 @@ workspace 'Examples.xcworkspace'
target "AFNetworking Example" do
platform :osx, '10.8'
xcodeproj "AFNetworking Mac Example.xcodeproj"
project "AFNetworking Mac Example.xcodeproj"
pod "AFNetworking", "1.3.3"
end
target "AFNetworking iOS Example" do
platform :ios, '8.0'
xcodeproj "AFNetworking iOS Example.xcodeproj"
project "AFNetworking iOS Example.xcodeproj"
pod "AFNetworking", "1.3.3"
end
examples/Resource Bundle Example/Example Pods/Images.xcassets/Contents.json 0 → 100644
View file @ f375b48f
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
examples/Resource Bundle Example/Example Pods/Images.xcassets/cat1.imageset/Contents.json 0 → 100644
View file @ f375b48f
{
"images" : [
{
"idiom" : "universal",
"filename" : "cat1.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
examples/Resource Bundle Example/Example Pods/Images.xcassets/cat2.imageset/Contents.json 0 → 100644
View file @ f375b48f
{
"images" : [
{
"idiom" : "universal",
"filename" : "cat2.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
examples/Resource Bundle Example/Example Pods/Images.xcassets/cat3.imageset/Contents.json 0 → 100644
View file @ f375b48f
{
"images" : [
{
"idiom" : "universal",
"filename" : "cat3.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
examples/Resource Bundle Example/Example Pods/ResourceAssetsExample.podspec 0 → 100644
View file @ f375b48f
Pod::Spec.new do |s|
s.name = "ResourceAssetsExample"
s.version = "0.0.1"
s.summary = "Resource in a spec test pod."
s.description = "This spec specifies an asset catalog as a resource."
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.homepage = "https://cocoapods.org"
s.license = { :type => "MIT", :file => "../../../LICENSE" }
s.author = { "Ben Asher" => "benasher44@gmail.com" }
s.source = { :path => "." }
s.source_files = "Example.swift"
s.resource = "Images.xcassets"
end
examples/Resource Bundle Example/Example Pods/ResourceExample.podspec 0 → 100644
View file @ f375b48f
Pod::Spec.new do |s|
s.name = "ResourceExample"
s.version = "0.0.1"
s.summary = "Resource in a spec test pod."
s.description = "This spec specifies a bundle as a resource."
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.homepage = "https://cocoapods.org"
s.license = { :type => "MIT", :file => "../../../LICENSE" }
s.author = { "Ben Asher" => "benasher44@gmail.com" }
s.source = { :path => "." }
s.source_files = "Example.swift"
s.resource = "Resources.bundle"
end
examples/Resource Bundle Example/Example Pods/ResourcesBundleExample.podspec 0 → 100644
View file @ f375b48f
Pod::Spec.new do |s|
s.name = "ResourcesBundleExample"
s.version = "0.0.1"
s.summary = "Resources in a spec test pod."
s.description = "This spec specifies images as resources."
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.homepage = "https://cocoapods.org"
s.license = { :type => "MIT", :file => "../../../LICENSE" }
s.author = { "Ben Asher" => "benasher44@gmail.com" }
s.source = { :path => "." }
s.source_files = "Example.swift"
s.resource_bundles = {"ResourcesBundleExample" => ["Resources/*.jpg"] }
end
examples/Resource Bundle Example/Example Pods/ResourcesExample.podspec 0 → 100644
View file @ f375b48f
Pod::Spec.new do |s|
s.name = "ResourcesExample"
s.version = "0.0.1"
s.summary = "Resources in a spec test pod."
s.description = "This spec specifies images as resources."
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.homepage = "https://cocoapods.org"
s.license = { :type => "MIT", :file => "../../../LICENSE" }
s.author = { "Ben Asher" => "benasher44@gmail.com" }
s.source = { :path => "." }
s.source_files = "Example.swift"
s.resources = "Resources/*.jpg"
end
examples/Resource Bundle Example/Examples.xcworkspace/contents.xcworkspacedata 0 → 100644
View file @ f375b48f
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:Resource Bundle Example.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>
examples/Resource Bundle Example/Podfile 0 → 100644
View file @ f375b48f
platform :ios, '8.0'
use_frameworks!
workspace 'Examples.xcworkspace'
project 'Resource Bundle Example.xcodeproj'
target 'Resource Bundle Example' do
pod 'ResourceExample', :path => 'Example Pods'
pod 'ResourcesExample', :path => 'Example Pods'
pod 'ResourceAssetsExample', :path => 'Example Pods'
pod 'ResourcesBundleExample', :path => 'Example Pods'
end
examples/Resource Bundle Example/Resource Bundle Example.xcodeproj/project.pbxproj 0 → 100644
View file @ f375b48f
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
194F0446F26D7FB491119F93 /* Pods_Resource_Bundle_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 683360ECF4FA39345D55C4F4 /* Pods_Resource_Bundle_Example.framework */; };
A8C77C541C9DA931000AFF69 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A8C77C531C9DA931000AFF69 /* main.m */; };
A8C77C571C9DA931000AFF69 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A8C77C561C9DA931000AFF69 /* AppDelegate.m */; };
A8C77C5A1C9DA931000AFF69 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A8C77C591C9DA931000AFF69 /* ViewController.m */; };
A8C77C5D1C9DA931000AFF69 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A8C77C5B1C9DA931000AFF69 /* Main.storyboard */; };
A8C77C5F1C9DA931000AFF69 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A8C77C5E1C9DA931000AFF69 /* Assets.xcassets */; };
A8C77C621C9DA931000AFF69 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A8C77C601C9DA931000AFF69 /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
10B8F5D36339B23370337CC5 /* Pods-Resource Bundle Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Resource Bundle Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Resource Bundle Example/Pods-Resource Bundle Example.debug.xcconfig"; sourceTree = "<group>"; };
683360ECF4FA39345D55C4F4 /* Pods_Resource_Bundle_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Resource_Bundle_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A8C77C4F1C9DA931000AFF69 /* Resource Bundle Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Resource Bundle Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A8C77C531C9DA931000AFF69 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
A8C77C551C9DA931000AFF69 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
A8C77C561C9DA931000AFF69 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
A8C77C581C9DA931000AFF69 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
A8C77C591C9DA931000AFF69 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
A8C77C5C1C9DA931000AFF69 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
A8C77C5E1C9DA931000AFF69 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A8C77C611C9DA931000AFF69 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A8C77C631C9DA931000AFF69 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
FB8DF5F89FA0B0BDC30AAAFD /* Pods-Resource Bundle Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Resource Bundle Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Resource Bundle Example/Pods-Resource Bundle Example.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
A8C77C4C1C9DA931000AFF69 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
194F0446F26D7FB491119F93 /* Pods_Resource_Bundle_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
407203427D310DFDF1BFCD73 /* Pods */ = {
isa = PBXGroup;
children = (
10B8F5D36339B23370337CC5 /* Pods-Resource Bundle Example.debug.xcconfig */,
FB8DF5F89FA0B0BDC30AAAFD /* Pods-Resource Bundle Example.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
A8C77C461C9DA931000AFF69 = {
isa = PBXGroup;
children = (
A8C77C511C9DA931000AFF69 /* Resource Bundle Example */,
A8C77C501C9DA931000AFF69 /* Products */,
407203427D310DFDF1BFCD73 /* Pods */,
EA8DCC35B91FAC83C474E46A /* Frameworks */,
);
sourceTree = "<group>";
};
A8C77C501C9DA931000AFF69 /* Products */ = {
isa = PBXGroup;
children = (
A8C77C4F1C9DA931000AFF69 /* Resource Bundle Example.app */,
);
name = Products;
sourceTree = "<group>";
};
A8C77C511C9DA931000AFF69 /* Resource Bundle Example */ = {
isa = PBXGroup;
children = (
A8C77C551C9DA931000AFF69 /* AppDelegate.h */,
A8C77C561C9DA931000AFF69 /* AppDelegate.m */,
A8C77C581C9DA931000AFF69 /* ViewController.h */,
A8C77C591C9DA931000AFF69 /* ViewController.m */,
A8C77C5B1C9DA931000AFF69 /* Main.storyboard */,
A8C77C5E1C9DA931000AFF69 /* Assets.xcassets */,
A8C77C601C9DA931000AFF69 /* LaunchScreen.storyboard */,
A8C77C631C9DA931000AFF69 /* Info.plist */,
A8C77C521C9DA931000AFF69 /* Supporting Files */,
);
path = "Resource Bundle Example";
sourceTree = "<group>";
};
A8C77C521C9DA931000AFF69 /* Supporting Files */ = {
isa = PBXGroup;
children = (
A8C77C531C9DA931000AFF69 /* main.m */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
EA8DCC35B91FAC83C474E46A /* Frameworks */ = {
isa = PBXGroup;
children = (
683360ECF4FA39345D55C4F4 /* Pods_Resource_Bundle_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
A8C77C4E1C9DA931000AFF69 /* Resource Bundle Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = A8C77C661C9DA931000AFF69 /* Build configuration list for PBXNativeTarget "Resource Bundle Example" */;
buildPhases = (
8FB5EE32BFE997FC437DE638 /* 📦 Check Pods Manifest.lock */,
A8C77C4B1C9DA931000AFF69 /* Sources */,
A8C77C4C1C9DA931000AFF69 /* Frameworks */,
A8C77C4D1C9DA931000AFF69 /* Resources */,
E1D153F1317B0ED8A0A98DE0 /* 📦 Embed Pods Frameworks */,
41F27F05FA87A7FE9EA1A2BF /* 📦 Copy Pods Resources */,
);
buildRules = (
);
dependencies = (
);
name = "Resource Bundle Example";
productName = "Resource Bundle Example";
productReference = A8C77C4F1C9DA931000AFF69 /* Resource Bundle Example.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
A8C77C471C9DA931000AFF69 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0720;
ORGANIZATIONNAME = Example;
TargetAttributes = {
A8C77C4E1C9DA931000AFF69 = {
CreatedOnToolsVersion = 7.2.1;
};
};
};
buildConfigurationList = A8C77C4A1C9DA931000AFF69 /* Build configuration list for PBXProject "Resource Bundle Example" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = A8C77C461C9DA931000AFF69;
productRefGroup = A8C77C501C9DA931000AFF69 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
A8C77C4E1C9DA931000AFF69 /* Resource Bundle Example */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
A8C77C4D1C9DA931000AFF69 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A8C77C621C9DA931000AFF69 /* LaunchScreen.storyboard in Resources */,
A8C77C5F1C9DA931000AFF69 /* Assets.xcassets in Resources */,
A8C77C5D1C9DA931000AFF69 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
41F27F05FA87A7FE9EA1A2BF /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Resource Bundle Example/Pods-Resource Bundle Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
8FB5EE32BFE997FC437DE638 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
E1D153F1317B0ED8A0A98DE0 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Resource Bundle Example/Pods-Resource Bundle Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
A8C77C4B1C9DA931000AFF69 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A8C77C5A1C9DA931000AFF69 /* ViewController.m in Sources */,
A8C77C571C9DA931000AFF69 /* AppDelegate.m in Sources */,
A8C77C541C9DA931000AFF69 /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
A8C77C5B1C9DA931000AFF69 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
A8C77C5C1C9DA931000AFF69 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
A8C77C601C9DA931000AFF69 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
A8C77C611C9DA931000AFF69 /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
A8C77C641C9DA931000AFF69 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
A8C77C651C9DA931000AFF69 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
A8C77C671C9DA931000AFF69 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 10B8F5D36339B23370337CC5 /* Pods-Resource Bundle Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "Resource Bundle Example/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.example.Resource-Bundle-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
A8C77C681C9DA931000AFF69 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FB8DF5F89FA0B0BDC30AAAFD /* Pods-Resource Bundle Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "Resource Bundle Example/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.example.Resource-Bundle-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
A8C77C4A1C9DA931000AFF69 /* Build configuration list for PBXProject "Resource Bundle Example" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A8C77C641C9DA931000AFF69 /* Debug */,
A8C77C651C9DA931000AFF69 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
A8C77C661C9DA931000AFF69 /* Build configuration list for PBXNativeTarget "Resource Bundle Example" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A8C77C671C9DA931000AFF69 /* Debug */,
A8C77C681C9DA931000AFF69 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = A8C77C471C9DA931000AFF69 /* Project object */;
}
examples/Resource Bundle Example/Resource Bundle Example.xcodeproj/xcshareddata/xcschemes/Resource Bundle Example.xcscheme 0 → 100644
View file @ f375b48f
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A8C77C4E1C9DA931000AFF69"
BuildableName = "Resource Bundle Example.app"
BlueprintName = "Resource Bundle Example"
ReferencedContainer = "container:Resource Bundle Example.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A8C77C4E1C9DA931000AFF69"
BuildableName = "Resource Bundle Example.app"
BlueprintName = "Resource Bundle Example"
ReferencedContainer = "container:Resource Bundle Example.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A8C77C4E1C9DA931000AFF69"
BuildableName = "Resource Bundle Example.app"
BlueprintName = "Resource Bundle Example"
ReferencedContainer = "container:Resource Bundle Example.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A8C77C4E1C9DA931000AFF69"
BuildableName = "Resource Bundle Example.app"
BlueprintName = "Resource Bundle Example"
ReferencedContainer = "container:Resource Bundle Example.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
examples/Resource Bundle Example/Resource Bundle Example/AppDelegate.h 0 → 100644
View file @ f375b48f
//
// AppDelegate.h
// Resource Bundle Example
//
// Created by Ben Asher on 3/19/16.
// Copyright © 2016 Example. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface AppDelegate : UIResponder <UIApplicationDelegate>
@property (strong, nonatomic) UIWindow *window;
@end
examples/Resource Bundle Example/Resource Bundle Example/AppDelegate.m 0 → 100644
View file @ f375b48f
//
// AppDelegate.m
// Resource Bundle Example
//
// Created by Ben Asher on 3/19/16.
// Copyright © 2016 Example. All rights reserved.
//
#import "AppDelegate.h"
@interface AppDelegate ()
@end
@implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.
return YES;
}
- (void)applicationWillResignActive:(UIApplication *)application {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}
- (void)applicationDidEnterBackground:(UIApplication *)application {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
- (void)applicationWillEnterForeground:(UIApplication *)application {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}
- (void)applicationDidBecomeActive:(UIApplication *)application {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
- (void)applicationWillTerminate:(UIApplication *)application {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
@end
examples/Resource Bundle Example/Resource Bundle Example/Assets.xcassets/AppIcon.appiconset/Contents.json 0 → 100644
View file @ f375b48f
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
examples/Resource Bundle Example/Resource Bundle Example/Base.lproj/LaunchScreen.storyboard 0 → 100644
View file @ f375b48f
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
examples/Resource Bundle Example/Resource Bundle Example/Base.lproj/Main.storyboard 0 → 100644
View file @ f375b48f
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
</scene>
</scenes>
</document>
examples/Resource Bundle Example/Resource Bundle Example/Info.plist 0 → 100644
View file @ f375b48f
<?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>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</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>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
examples/Resource Bundle Example/Resource Bundle Example/ViewController.h 0 → 100644
View file @ f375b48f
//
// ViewController.h
// Resource Bundle Example
//
// Created by Ben Asher on 3/19/16.
// Copyright © 2016 Example. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ViewController : UIViewController
@end
examples/Resource Bundle Example/Resource Bundle Example/ViewController.m 0 → 100644
View file @ f375b48f
//
// ViewController.m
// Resource Bundle Example
//
// Created by Ben Asher on 3/19/16.
// Copyright © 2016 Example. All rights reserved.
//
#import "ViewController.h"
@interface ViewController ()
@end
@implementation ViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view, typically from a nib.
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
@end
examples/Resource Bundle Example/Resource Bundle Example/main.m 0 → 100644
View file @ f375b48f
//
// main.m
// Resource Bundle Example
//
// Created by Ben Asher on 3/19/16.
// Copyright © 2016 Example. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "AppDelegate.h"
int main(int argc, char * argv[]) {
@autoreleasepool {
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
}
}
lib/cocoapods/installer/target_installer/pod_target_installer.rb
View file @ f375b48f
......@@ -177,7 +177,7 @@ module Pod
c.build_settings['PRODUCT_NAME'] = bundle_name
relative_info_plist_path = info_plist_path.relative_path_from(sandbox.root)
c.build_settings['INFOPLIST_FILE'] = relative_info_plist_path.to_s
c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir('$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)')
# Set the correct device family for this bundle, based on the platform
device_family_by_platform = {
......
cocoapods-integration-specs @ 5ab50939
Subproject commit d8a969fbd7d5117cf9c0682a2a5ef40abd8f29d0
Subproject commit 5ab50939447c8c69fe3ab4cbfceaab3c90dd7f33
spec/unit/installer/target_installer/pod_target_installer_spec.rb
View file @ f375b48f
......@@ -190,7 +190,7 @@ module Pod
it 'sets the correct build dir' do
@bundle_target.build_configurations.each do |bc|
bc.build_settings['CONFIGURATION_BUILD_DIR'].should == '$CONFIGURATION_BUILD_DIR/BananaLib-Pods-SampleProject'
bc.build_settings['CONFIGURATION_BUILD_DIR'].should == '$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/BananaLib-Pods-SampleProject'
end
end
......
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