Fix iOS public header name

flinto · Jul 18, 2017 · 41ec82e · 41ec82e
1 parent 6e0607f
commit 41ec82e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,7 @@ deploy:
   api_key:
     secure: xFyFX1BKvgphTttmD7lNX9A4B8AiDJLzCP8oQ0f3gm9G6/KQ8EfiQhT+VNeLYMyvPvV+BfMSOkgsNBGWiXyc0hRedFZuwo1bVHzgC7t9mcL77FEX60jkh2ZJ89cVVmhOAaidrLamNrGvdAoyDHEcg92rOXVaJWuc7jARakOHvmJDxVcDag0iPx7QmACTR5uyhtJ5e9URuUFhN6Os2lqMYTDwdPyirLtBq9LTfJJllXK1as1ao/7YJkAq867cL5TkXOg1ihKo/HnLlPu/y4lreKioTqNFgSUQ2/WVVuXWsdObXheulveXzCnrMHpitECIVVwRymbr2ke7MMWDw0bjY/Al8te3iY0fAWq4E9zFMVFU1ud9tsWZ78YcRp1MrQizCldvm2Fp2soE3XjvIBg4Og4tYGUWqhmLqMurvyIz4t9Pzrr7RHIvwEhV8LQvMYHm8AyMGAJxMh2CucMfCGHU4TWBI+qNPsIihI1smekU9sPo6Aer9v7bhBTeOriS708bS5FjZZg3Bx4LI9Hr5pKPwaASIRgrv2Wxy+Xf94JbVoqfDJraLoPj30ndGyb8sWlsNit3flg4/7ylDLA22EwKEAsHnq8miPSz1tMKTi36mkATGPogvry/oYkXyKKVMljx6B+R/mMZrZuzjcZOWALjTC4vdJOF4KrH6nkUTTlXbzU=
   file: "$FRAMEWORK_NAME.framework.zip"
+  skip_cleanup: true
   on:
     repo: flinto/Spring
     tags: true
diff --git a/RK4SpringDemo.xcodeproj/project.pbxproj b/RK4SpringDemo.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
 		6E3BBB5F1F1E757800894AF1 /* RK4Spring.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6E3BBB571F1E757800894AF1 /* RK4Spring.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6E3BBB721F1E759800894AF1 /* RK4Spring.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E3BBB691F1E759800894AF1 /* RK4Spring.framework */; };
 		6E3BBB771F1E759800894AF1 /* RK4Spring_iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E3BBB761F1E759800894AF1 /* RK4Spring_iOSTests.swift */; };
-		6E3BBB791F1E759800894AF1 /* RK4Spring_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E3BBB6B1F1E759800894AF1 /* RK4Spring_iOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6E3BBB791F1E759800894AF1 /* RK4Spring.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E3BBB6B1F1E759800894AF1 /* RK4Spring.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6E3BBB801F1E765900894AF1 /* RK4Spring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E3C28CA1C20AA6000CAD137 /* RK4Spring.swift */; };
 		6E3BBB811F1E765900894AF1 /* RK4Spring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E3C28CA1C20AA6000CAD137 /* RK4Spring.swift */; };
 		6E3BBB841F1E776D00894AF1 /* RK4Spring.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E3BBB821F1E776300894AF1 /* RK4Spring.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -56,7 +56,7 @@
 		6E2D79111F1E783C00E44FB2 /* RK4Spring.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = RK4Spring.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		6E3BBB571F1E757800894AF1 /* RK4Spring.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RK4Spring.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E3BBB691F1E759800894AF1 /* RK4Spring.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RK4Spring.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		6E3BBB6B1F1E759800894AF1 /* RK4Spring_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RK4Spring_iOS.h; sourceTree = "<group>"; };
+		6E3BBB6B1F1E759800894AF1 /* RK4Spring.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RK4Spring.h; sourceTree = "<group>"; };
 		6E3BBB6C1F1E759800894AF1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E3BBB711F1E759800894AF1 /* RK4Spring_iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RK4Spring_iOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E3BBB761F1E759800894AF1 /* RK4Spring_iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RK4Spring_iOSTests.swift; sourceTree = "<group>"; };
@@ -118,7 +118,7 @@
 		6E3BBB6A1F1E759800894AF1 /* RK4Spring_iOS */ = {
 			isa = PBXGroup;
 			children = (
-				6E3BBB6B1F1E759800894AF1 /* RK4Spring_iOS.h */,
+				6E3BBB6B1F1E759800894AF1 /* RK4Spring.h */,
 				6E3BBB6C1F1E759800894AF1 /* Info.plist */,
 			);
 			path = RK4Spring_iOS;
@@ -184,7 +184,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6E3BBB791F1E759800894AF1 /* RK4Spring_iOS.h in Headers */,
+				6E3BBB791F1E759800894AF1 /* RK4Spring.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -420,7 +420,7 @@
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -432,9 +432,8 @@
 				INFOPLIST_FILE = RK4Spring_macOS/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.flinto.RK4Spring;
-				PRODUCT_MODULE_NAME = RK4Spring;
 				PRODUCT_NAME = RK4Spring;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -458,7 +457,7 @@
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -470,9 +469,8 @@
 				INFOPLIST_FILE = RK4Spring_macOS/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.flinto.RK4Spring;
-				PRODUCT_MODULE_NAME = RK4Spring;
 				PRODUCT_NAME = RK4Spring;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 4.0;
@@ -506,7 +504,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = RK4Spring_iOS/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.flinto.RK4Spring;
 				PRODUCT_MODULE_NAME = RK4Spring;
@@ -546,7 +544,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = RK4Spring_iOS/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.flinto.RK4Spring;
 				PRODUCT_MODULE_NAME = RK4Spring;
@@ -665,6 +663,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -711,6 +710,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;

diff --git a/RK4SpringDemo.xcodeproj/xcshareddata/xcschemes/RK4Spring_iOS.xcscheme b/RK4SpringDemo.xcodeproj/xcshareddata/xcschemes/RK4Spring_iOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6E3BBB681F1E759800894AF1"
-               BuildableName = "RK4Spring_iOS.framework"
+               BuildableName = "RK4Spring.framework"
                BlueprintName = "RK4Spring_iOS"
                ReferencedContainer = "container:RK4SpringDemo.xcodeproj">
             </BuildableReference>
@@ -44,7 +44,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6E3BBB681F1E759800894AF1"
-            BuildableName = "RK4Spring_iOS.framework"
+            BuildableName = "RK4Spring.framework"
             BlueprintName = "RK4Spring_iOS"
             ReferencedContainer = "container:RK4SpringDemo.xcodeproj">
          </BuildableReference>
@@ -67,7 +67,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6E3BBB681F1E759800894AF1"
-            BuildableName = "RK4Spring_iOS.framework"
+            BuildableName = "RK4Spring.framework"
             BlueprintName = "RK4Spring_iOS"
             ReferencedContainer = "container:RK4SpringDemo.xcodeproj">
          </BuildableReference>
@@ -85,7 +85,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6E3BBB681F1E759800894AF1"
-            BuildableName = "RK4Spring_iOS.framework"
+            BuildableName = "RK4Spring.framework"
             BlueprintName = "RK4Spring_iOS"
             ReferencedContainer = "container:RK4SpringDemo.xcodeproj">
          </BuildableReference>

diff --git a/RK4SpringDemo.xcodeproj/xcshareddata/xcschemes/RK4Spring_macOS.xcscheme b/RK4SpringDemo.xcodeproj/xcshareddata/xcschemes/RK4Spring_macOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6E3BBB561F1E757800894AF1"
-               BuildableName = "RK4Spring_macOS.framework"
+               BuildableName = "RK4Spring.framework"
                BlueprintName = "RK4Spring_macOS"
                ReferencedContainer = "container:RK4SpringDemo.xcodeproj">
             </BuildableReference>
@@ -48,7 +48,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6E3BBB561F1E757800894AF1"
-            BuildableName = "RK4Spring_macOS.framework"
+            BuildableName = "RK4Spring.framework"
             BlueprintName = "RK4Spring_macOS"
             ReferencedContainer = "container:RK4SpringDemo.xcodeproj">
          </BuildableReference>
@@ -66,7 +66,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6E3BBB561F1E757800894AF1"
-            BuildableName = "RK4Spring_macOS.framework"
+            BuildableName = "RK4Spring.framework"
             BlueprintName = "RK4Spring_macOS"
             ReferencedContainer = "container:RK4SpringDemo.xcodeproj">
          </BuildableReference>

diff --git a/RK4Spring_iOS/RK4Spring.h b/RK4Spring_iOS/RK4Spring.h
@@ -0,0 +1,19 @@
+//
+//  RK4Spring.h
+//  RK4Spring
+//
+//  Created by Kazuho Okui on 7/18/17.
+//  Copyright © 2017 Flinto. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for RK4Spring.
+FOUNDATION_EXPORT double RK4SpringVersionNumber;
+
+//! Project version string for RK4Spring.
+FOUNDATION_EXPORT const unsigned char RK4SpringVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <RK4Spring/PublicHeader.h>
+
+
diff --git a/RK4Spring_iOS/RK4Spring_iOS.h b/RK4Spring_iOS/RK4Spring_iOS.h