Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getting resources from prebuilt framework #84

Merged
merged 4 commits into from
Feb 9, 2021
Merged

Fix getting resources from prebuilt framework #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf20013
Add localization resources to build phases
timbaev Feb 8, 2021
f3160e0
Add Bundle with localization resources and linked to Mantis target
timbaev Feb 8, 2021
9af81a6
Rename bundle to 'Resource'
timbaev Feb 8, 2021
43f4d53
Set bundle identifier for Mantis target
timbaev Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
228 changes: 226 additions & 2 deletions Mantis.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
5F17E40A253535F300A3EB7D /* Orientation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F17E409253535F300A3EB7D /* Orientation.swift */; };
5F7D22AE245BCA8D0015A0D5 /* CropToolbarProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F7D22AD245BCA8D0015A0D5 /* CropToolbarProtocol.swift */; };
5FCE938724834C57002BBE65 /* ToolbarButtonOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FCE938624834C57002BBE65 /* ToolbarButtonOptions.swift */; };
8EFB6F6725D16B0F00C0DDB2 /* MantisLocalizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8EFB6F3525D154D900C0DDB2 /* MantisLocalizable.strings */; };
8EFB6FB125D187A000C0DDB2 /* Resource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8EFB6F5425D16A9E00C0DDB2 /* Resource.bundle */; };
FEDAAD8625205CC300D95667 /* RatioSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEDAAD8525205CC300D95667 /* RatioSelector.swift */; };
FEDAAD8C25205DE900D95667 /* RatioItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEDAAD8B25205DE900D95667 /* RatioItemView.swift */; };
OBJ_100 /* RotationDialPlate.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_48 /* RotationDialPlate.swift */; };
Expand Down Expand Up @@ -80,12 +82,34 @@
remoteGlobalIDString = "Mantis::MantisTests";
remoteInfo = MantisTests;
};
8EFB6F6525D16AE300C0DDB2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = OBJ_1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 8EFB6F5325D16A9E00C0DDB2;
remoteInfo = "Mantis-Resource";
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
5F17E409253535F300A3EB7D /* Orientation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Orientation.swift; sourceTree = "<group>"; };
5F7D22AD245BCA8D0015A0D5 /* CropToolbarProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CropToolbarProtocol.swift; sourceTree = "<group>"; };
5FCE938624834C57002BBE65 /* ToolbarButtonOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarButtonOptions.swift; sourceTree = "<group>"; };
8EFB6F3625D154D900C0DDB2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F3725D154D900C0DDB2 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F3825D154D900C0DDB2 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/MantisLocalizable.strings"; sourceTree = "<group>"; };
8EFB6F3925D154D900C0DDB2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F3A25D154D900C0DDB2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F3B25D154D900C0DDB2 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F3C25D154D900C0DDB2 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F3D25D154D900C0DDB2 /* ko-KR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ko-KR"; path = "ko-KR.lproj/MantisLocalizable.strings"; sourceTree = "<group>"; };
8EFB6F3E25D154D900C0DDB2 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F3F25D154D900C0DDB2 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/MantisLocalizable.strings"; sourceTree = "<group>"; };
8EFB6F4025D154D900C0DDB2 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F4125D154D900C0DDB2 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MantisLocalizable.strings; sourceTree = "<group>"; };
8EFB6F4225D154D900C0DDB2 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/MantisLocalizable.strings"; sourceTree = "<group>"; };
8EFB6F5425D16A9E00C0DDB2 /* Resource.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Resource.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
8EFB6F5625D16A9F00C0DDB2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
FEDAAD8525205CC300D95667 /* RatioSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RatioSelector.swift; sourceTree = "<group>"; };
FEDAAD8B25205DE900D95667 /* RatioItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RatioItemView.swift; sourceTree = "<group>"; };
"Mantis::Mantis::Product" /* Mantis.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Mantis.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -137,6 +161,13 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
8EFB6F5125D16A9E00C0DDB2 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
OBJ_102 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 0;
Expand All @@ -155,6 +186,22 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
8EFB6F3425D154D900C0DDB2 /* Resources */ = {
isa = PBXGroup;
children = (
8EFB6F3525D154D900C0DDB2 /* MantisLocalizable.strings */,
);
path = Resources;
sourceTree = "<group>";
};
8EFB6F5525D16A9F00C0DDB2 /* Resource */ = {
isa = PBXGroup;
children = (
8EFB6F5625D16A9F00C0DDB2 /* Info.plist */,
);
path = Resource;
sourceTree = "<group>";
};
OBJ_11 /* CropView */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -238,6 +285,7 @@
OBJ_6 /* Package.swift */,
OBJ_7 /* Sources */,
OBJ_50 /* Tests */,
8EFB6F5525D16A9F00C0DDB2 /* Resource */,
OBJ_54 /* Products */,
OBJ_57 /* Images */,
OBJ_59 /* MantisTests */,
Expand Down Expand Up @@ -271,6 +319,7 @@
children = (
"Mantis::MantisTests::Product" /* MantisTests.xctest */,
"Mantis::Mantis::Product" /* Mantis.framework */,
8EFB6F5425D16A9E00C0DDB2 /* Resource.bundle */,
);
name = Products;
sourceTree = BUILT_PRODUCTS_DIR;
Expand All @@ -294,6 +343,7 @@
OBJ_11 /* CropView */,
OBJ_23 /* CropViewController */,
OBJ_29 /* Extensions */,
8EFB6F3425D154D900C0DDB2 /* Resources */,
OBJ_33 /* Helpers */,
OBJ_37 /* MaskBackground */,
OBJ_42 /* RotationDial */,
Expand All @@ -305,16 +355,35 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
8EFB6F5325D16A9E00C0DDB2 /* Mantis-Resource */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8EFB6F5725D16A9F00C0DDB2 /* Build configuration list for PBXNativeTarget "Mantis-Resource" */;
buildPhases = (
8EFB6F5025D16A9E00C0DDB2 /* Sources */,
8EFB6F5125D16A9E00C0DDB2 /* Frameworks */,
8EFB6F5225D16A9E00C0DDB2 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "Mantis-Resource";
productName = Resource;
productReference = 8EFB6F5425D16A9E00C0DDB2 /* Resource.bundle */;
productType = "com.apple.product-type.bundle";
};
"Mantis::Mantis" /* Mantis */ = {
isa = PBXNativeTarget;
buildConfigurationList = OBJ_65 /* Build configuration list for PBXNativeTarget "Mantis" */;
buildPhases = (
OBJ_68 /* Sources */,
OBJ_102 /* Frameworks */,
8EFB6F3325D1548800C0DDB2 /* Resources */,
);
buildRules = (
);
dependencies = (
8EFB6F6625D16AE300C0DDB2 /* PBXTargetDependency */,
);
name = Mantis;
productName = Mantis;
Expand Down Expand Up @@ -360,6 +429,12 @@
attributes = {
LastSwiftMigration = 9999;
LastUpgradeCheck = 1200;
TargetAttributes = {
8EFB6F5325D16A9E00C0DDB2 = {
CreatedOnToolsVersion = 12.4;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "Mantis" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -368,6 +443,18 @@
knownRegions = (
en,
Base,
de,
ar,
"zh-Hans",
ja,
es,
it,
"ko-KR",
ko,
"zh-Hant",
ru,
fr,
"pt-PT",
);
mainGroup = OBJ_5;
productRefGroup = OBJ_54 /* Products */;
Expand All @@ -378,11 +465,38 @@
"Mantis::SwiftPMPackageDescription" /* MantisPackageDescription */,
"Mantis::MantisPackageTests::ProductTarget" /* MantisPackageTests */,
"Mantis::MantisTests" /* MantisTests */,
8EFB6F5325D16A9E00C0DDB2 /* Mantis-Resource */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
8EFB6F3325D1548800C0DDB2 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8EFB6FB125D187A000C0DDB2 /* Resource.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
8EFB6F5225D16A9E00C0DDB2 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8EFB6F6725D16B0F00C0DDB2 /* MantisLocalizable.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
8EFB6F5025D16A9E00C0DDB2 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
OBJ_107 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 0;
Expand Down Expand Up @@ -448,6 +562,11 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
8EFB6F6625D16AE300C0DDB2 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8EFB6F5325D16A9E00C0DDB2 /* Mantis-Resource */;
targetProxy = 8EFB6F6525D16AE300C0DDB2 /* PBXContainerItemProxy */;
};
OBJ_113 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = "Mantis::MantisTests" /* MantisTests */;
Expand All @@ -460,7 +579,101 @@
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
8EFB6F3525D154D900C0DDB2 /* MantisLocalizable.strings */ = {
isa = PBXVariantGroup;
children = (
8EFB6F3625D154D900C0DDB2 /* de */,
8EFB6F3725D154D900C0DDB2 /* ar */,
8EFB6F3825D154D900C0DDB2 /* zh-Hans */,
8EFB6F3925D154D900C0DDB2 /* ja */,
8EFB6F3A25D154D900C0DDB2 /* en */,
8EFB6F3B25D154D900C0DDB2 /* es */,
8EFB6F3C25D154D900C0DDB2 /* it */,
8EFB6F3D25D154D900C0DDB2 /* ko-KR */,
8EFB6F3E25D154D900C0DDB2 /* ko */,
8EFB6F3F25D154D900C0DDB2 /* zh-Hant */,
8EFB6F4025D154D900C0DDB2 /* ru */,
8EFB6F4125D154D900C0DDB2 /* fr */,
8EFB6F4225D154D900C0DDB2 /* pt-PT */,
);
name = MantisLocalizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
8EFB6F5825D16A9F00C0DDB2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Sources/Mantis/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.echo.framework.Mantis;
PRODUCT_NAME = Resource;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = bundle;
};
name = Debug;
};
8EFB6F5925D16A9F00C0DDB2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Sources/Mantis/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.echo.framework.Mantis;
PRODUCT_NAME = Resource;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = bundle;
};
name = Release;
};
OBJ_105 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -656,6 +869,7 @@
OBJ_66 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CURRENT_PROJECT_VERSION = 1;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -670,7 +884,7 @@
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = Mantis;
PRODUCT_BUNDLE_IDENTIFIER = com.echo.framework.Mantis;
PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand All @@ -686,6 +900,7 @@
OBJ_67 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CURRENT_PROJECT_VERSION = 1;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -700,7 +915,7 @@
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = Mantis;
PRODUCT_BUNDLE_IDENTIFIER = com.echo.framework.Mantis;
PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand All @@ -716,6 +931,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
8EFB6F5725D16A9F00C0DDB2 /* Build configuration list for PBXNativeTarget "Mantis-Resource" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8EFB6F5825D16A9F00C0DDB2 /* Debug */,
8EFB6F5925D16A9F00C0DDB2 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
OBJ_104 /* Build configuration list for PBXNativeTarget "MantisPackageDescription" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
Loading