azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve calculator sample compatibility with submission to AppStore (#1227)

Browse Source 
*   Change bundle name and display name to prevent clash with standard
    iOS calculator application
*   Remove unsupported architectures from the bundle (armv7*)
This commit is contained in:
SvyatoslavScherbina
2018-01-12 14:30:18 +03:00
committed by Nikolay Igotti
parent 174adfe1f5
commit 4daaf9c99f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/calculator/calculator.xcodeproj/project.pbxproj
+10 -8
View File
@@ -31,7 +31,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
2C3F38411FD1738300151601 /* calculator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = calculator.app; sourceTree = BUILT_PRODUCTS_DIR; }; 2C3F38411FD1738300151601 /* KotlinCalculator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KotlinCalculator.app; sourceTree = BUILT_PRODUCTS_DIR; };
2C3F38441FD1738300151601 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 2C3F38441FD1738300151601 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2C3F38461FD1738300151601 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; 2C3F38461FD1738300151601 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
2C3F38491FD1738300151601 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 2C3F38491FD1738300151601 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -65,7 +65,7 @@
2C3F38421FD1738300151601 /* Products */ = { 2C3F38421FD1738300151601 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
2C3F38411FD1738300151601 /* calculator.app */, 2C3F38411FD1738300151601 /* KotlinCalculator.app */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -86,9 +86,9 @@
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
2C3F38401FD1738300151601 /* calculator */ = { 2C3F38401FD1738300151601 /* KotlinCalculator */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 2C3F38531FD1738300151601 /* Build configuration list for PBXNativeTarget "calculator" */; buildConfigurationList = 2C3F38531FD1738300151601 /* Build configuration list for PBXNativeTarget "KotlinCalculator" */;
buildPhases = ( buildPhases = (
2C3F38561FD1754800151601 /* Compile Kotlin Framework */, 2C3F38561FD1754800151601 /* Compile Kotlin Framework */,
2C3F383D1FD1738300151601 /* Sources */, 2C3F383D1FD1738300151601 /* Sources */,
@@ -100,9 +100,9 @@
); );
dependencies = ( dependencies = (
); );
name = calculator; name = KotlinCalculator;
productName = calculator; productName = calculator;
productReference = 2C3F38411FD1738300151601 /* calculator.app */; productReference = 2C3F38411FD1738300151601 /* KotlinCalculator.app */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@@ -134,7 +134,7 @@
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
2C3F38401FD1738300151601 /* calculator */, 2C3F38401FD1738300151601 /* KotlinCalculator */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
@@ -326,6 +326,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = arm64;
}; };
name = Debug; name = Debug;
}; };
@@ -347,6 +348,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = arm64;
}; };
name = Release; name = Release;
}; };
@@ -362,7 +364,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
2C3F38531FD1738300151601 /* Build configuration list for PBXNativeTarget "calculator" */ = { 2C3F38531FD1738300151601 /* Build configuration list for PBXNativeTarget "KotlinCalculator" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
2C3F38541FD1738300151601 /* Debug */, 2C3F38541FD1738300151601 /* Debug */,
samples/calculator/calculator/Info.plist
+2
View File
@@ -4,6 +4,8 @@
<dict> <dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string> <string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>KotlinCalc</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>