Skip to content

Commit a8c7145

Browse files
masashi-sutoumasashi-sutou
committed
converted Demo project to Swift4
1 parent 10aee04 commit a8c7145

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

‎Demo/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
"idiom" : "ipad",
8585
"size" : "83.5x83.5",
8686
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
8792
}
8893
],
8994
"info" : {

‎StudyplusSDK.xcodeproj/project.pbxproj

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
183FDAB11E754DCB0085589F /* StudyplusAPIRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB01E754DCB0085589F /* StudyplusAPIRequest.swift */; };
2323
183FDAB31E7561B90085589F /* StudyplusRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB21E7561B90085589F /* StudyplusRecord.swift */; };
2424
183FDAB51E7584C50085589F /* StudyplusRecordAmount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB41E7584C50085589F /* StudyplusRecordAmount.swift */; };
25-
183FDAB91E759E0F0085589F /* StudyplusSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; };
26-
183FDABA1E759E0F0085589F /* StudyplusSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2725
486C64C31E94E3BD00FCFE74 /* KeychainAccess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 486C64C21E94E3BD00FCFE74 /* KeychainAccess.framework */; };
26+
48D53DA61F72346A00FDB105 /* StudyplusSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; };
27+
48D53DA71F72346A00FDB105 /* StudyplusSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2828
879C2B31A68B2AB725BEC317 /* Pods_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F2BF8D56E016A5AA66C8A96 /* Pods_Demo.framework */; };
2929
/* End PBXBuildFile section */
3030

@@ -43,7 +43,7 @@
4343
remoteGlobalIDString = 183FDA841E7510F00085589F;
4444
remoteInfo = Demo;
4545
};
46-
183FDABB1E759E0F0085589F /* PBXContainerItemProxy */ = {
46+
48D53DA81F72346A00FDB105 /* PBXContainerItemProxy */ = {
4747
isa = PBXContainerItemProxy;
4848
containerPortal = 183FDA5E1E7510920085589F /* Project object */;
4949
proxyType = 1;
@@ -53,13 +53,13 @@
5353
/* End PBXContainerItemProxy section */
5454

5555
/* Begin PBXCopyFilesBuildPhase section */
56-
183FDABD1E759E0F0085589F /* Embed Frameworks */ = {
56+
48D53DAA1F72346A00FDB105 /* Embed Frameworks */ = {
5757
isa = PBXCopyFilesBuildPhase;
5858
buildActionMask = 2147483647;
5959
dstPath = "";
6060
dstSubfolderSpec = 10;
6161
files = (
62-
183FDABA1E759E0F0085589F /* StudyplusSDK.framework in Embed Frameworks */,
62+
48D53DA71F72346A00FDB105 /* StudyplusSDK.framework in Embed Frameworks */,
6363
);
6464
name = "Embed Frameworks";
6565
runOnlyForDeploymentPostprocessing = 0;
@@ -117,8 +117,8 @@
117117
isa = PBXFrameworksBuildPhase;
118118
buildActionMask = 2147483647;
119119
files = (
120-
183FDAB91E759E0F0085589F /* StudyplusSDK.framework in Frameworks */,
121120
879C2B31A68B2AB725BEC317 /* Pods_Demo.framework in Frameworks */,
121+
48D53DA61F72346A00FDB105 /* StudyplusSDK.framework in Frameworks */,
122122
);
123123
runOnlyForDeploymentPostprocessing = 0;
124124
};
@@ -279,14 +279,14 @@
279279
183FDA811E7510F00085589F /* Sources */,
280280
183FDA821E7510F00085589F /* Frameworks */,
281281
183FDA831E7510F00085589F /* Resources */,
282-
183FDABD1E759E0F0085589F /* Embed Frameworks */,
283282
764BEF1941D689B54DF91C96 /* [CP] Embed Pods Frameworks */,
284283
0D84BAE00562247D34CA7850 /* [CP] Copy Pods Resources */,
284+
48D53DAA1F72346A00FDB105 /* Embed Frameworks */,
285285
);
286286
buildRules = (
287287
);
288288
dependencies = (
289-
183FDABC1E759E0F0085589F /* PBXTargetDependency */,
289+
48D53DA91F72346A00FDB105 /* PBXTargetDependency */,
290290
);
291291
name = Demo;
292292
productName = Demo;
@@ -333,10 +333,12 @@
333333
};
334334
183FDA841E7510F00085589F = {
335335
CreatedOnToolsVersion = 8.2.1;
336+
LastSwiftMigration = 0900;
336337
ProvisioningStyle = Automatic;
337338
};
338339
183FDA971E7510F10085589F = {
339340
CreatedOnToolsVersion = 8.2.1;
341+
LastSwiftMigration = 0900;
340342
ProvisioningStyle = Automatic;
341343
TestTargetID = 183FDA841E7510F00085589F;
342344
};
@@ -503,10 +505,10 @@
503505
target = 183FDA841E7510F00085589F /* Demo */;
504506
targetProxy = 183FDA991E7510F10085589F /* PBXContainerItemProxy */;
505507
};
506-
183FDABC1E759E0F0085589F /* PBXTargetDependency */ = {
508+
48D53DA91F72346A00FDB105 /* PBXTargetDependency */ = {
507509
isa = PBXTargetDependency;
508510
target = 183FDA661E7510920085589F /* StudyplusSDK */;
509-
targetProxy = 183FDABB1E759E0F0085589F /* PBXContainerItemProxy */;
511+
targetProxy = 48D53DA81F72346A00FDB105 /* PBXContainerItemProxy */;
510512
};
511513
/* End PBXTargetDependency section */
512514

@@ -729,7 +731,7 @@
729731
isa = XCBuildConfiguration;
730732
baseConfigurationReference = 89218006880625385A599621 /* Pods-Demo.debug.xcconfig */;
731733
buildSettings = {
732-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
734+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
733735
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
734736
DEVELOPMENT_TEAM = "";
735737
INFOPLIST_FILE = Demo/Info.plist;
@@ -738,15 +740,16 @@
738740
OTHER_SWIFT_FLAGS = "$(inherited)";
739741
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
740742
PRODUCT_NAME = "$(TARGET_NAME)";
741-
SWIFT_VERSION = 3.0;
743+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
744+
SWIFT_VERSION = 4.0;
742745
};
743746
name = Debug;
744747
};
745748
183FDAA11E7510F10085589F /* Release */ = {
746749
isa = XCBuildConfiguration;
747750
baseConfigurationReference = 617BD1B3D302AA6EB05AD450 /* Pods-Demo.release.xcconfig */;
748751
buildSettings = {
749-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
752+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
750753
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
751754
DEVELOPMENT_TEAM = "";
752755
INFOPLIST_FILE = Demo/Info.plist;
@@ -755,7 +758,8 @@
755758
OTHER_SWIFT_FLAGS = "$(inherited)";
756759
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
757760
PRODUCT_NAME = "$(TARGET_NAME)";
758-
SWIFT_VERSION = 3.0;
761+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
762+
SWIFT_VERSION = 4.0;
759763
};
760764
name = Release;
761765
};
@@ -769,7 +773,8 @@
769773
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
770774
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
771775
PRODUCT_NAME = "$(TARGET_NAME)";
772-
SWIFT_VERSION = 3.0;
776+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
777+
SWIFT_VERSION = 4.0;
773778
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
774779
};
775780
name = Debug;
@@ -784,7 +789,8 @@
784789
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
785790
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
786791
PRODUCT_NAME = "$(TARGET_NAME)";
787-
SWIFT_VERSION = 3.0;
792+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
793+
SWIFT_VERSION = 4.0;
788794
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
789795
};
790796
name = Release;

0 commit comments

Comments
 (0)