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

Jump to bottom

Binary framework with xcframework format #80

Merged
merged 11 commits into from
Jul 25, 2019
Merged

Binary framework with xcframework format #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
34e7ca6
Setup project schemes for binary framework support
onevcat Jul 23, 2019
5ccfbe8
Update fastlane for building xcframework
onevcat Jul 23, 2019
912aa2e
No need to share scheme
onevcat Jul 23, 2019
90cc130
Enable module support for objc standalone build
onevcat Jul 23, 2019
419cad1
Rename scheme name
onevcat Jul 24, 2019
4cea7b0
Optional error when switching Xcode version
onevcat Jul 24, 2019
431e249
Auto generate context
onevcat Jul 24, 2019
0a5a4cd
Share binary schemes
onevcat Jul 24, 2019
750aafc
Merge branch 'v5.3' into feature/binary-framework
onevcat Jul 25, 2019
efcd895
Add related request file to target
onevcat Jul 25, 2019
6179876
Remove binary framework from carthage build
onevcat Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions LineSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<true/>
</dict>
</plist>
824 changes: 824 additions & 0 deletions LineSDK/LineSDK.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 11 additions & 15 deletions LineSDK/LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDK.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
onlyGenerateCoverageForSpecifiedTargets = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4B90587721006E5C004D717F"
BuildableName = "LineSDK.framework"
BlueprintName = "LineSDK"
ReferencedContainer = "container:LineSDK.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -64,17 +73,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4B90587721006E5C004D717F"
BuildableName = "LineSDK.framework"
BlueprintName = "LineSDK"
ReferencedContainer = "container:LineSDK.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -95,8 +93,6 @@
ReferencedContainer = "container:LineSDK.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
67 changes: 67 additions & 0 deletions LineSDK/LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDKBinary.xcscheme.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4B50EC6722E69B0D00225900"
BuildableName = "LineSDK.framework"
BlueprintName = "LineSDKBinary"
ReferencedContainer = "container:LineSDK.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</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">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4B50EC6722E69B0D00225900"
BuildableName = "LineSDK.framework"
BlueprintName = "LineSDKBinary"
ReferencedContainer = "container:LineSDK.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
67 changes: 67 additions & 0 deletions LineSDK/LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDKObjCBinary.xcscheme.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4B50ED1F22E6A94100225900"
BuildableName = "LineSDK.framework"
BlueprintName = "LineSDKObjCBinary"
ReferencedContainer = "container:LineSDK.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</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">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4B50ED1F22E6A94100225900"
BuildableName = "LineSDK.framework"
BlueprintName = "LineSDKObjCBinary"
ReferencedContainer = "container:LineSDK.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
6 changes: 3 additions & 3 deletions LineSDK/LineSDK/LineSDKUI/ResourceLoading.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extension UIImage {
convenience init?(bundleNamed name: String, compatibleWith trait: UITraitCollection? = nil) {
let bundle: Bundle
#if LineSDKCocoaPods
bundle = .sdkBundle
bundle = .podsBundle
#else
bundle = .frameworkBundle
#endif
Expand All @@ -49,7 +49,7 @@ extension Bundle {
static let frameworkResourceBundle: Bundle = {
let parentBundle: Bundle
#if LineSDKCocoaPods
parentBundle = sdkBundle
parentBundle = podsBundle
#else
parentBundle = frameworkBundle
#endif
Expand All @@ -65,7 +65,7 @@ extension Bundle {

#if LineSDKCocoaPods
// SDK Bundle is for CocoaPods: ( sp.resource_bundles = { 'LineSDK' => [ ... ] } )
static let sdkBundle: Bundle = {
static let podsBundle: Bundle = {
guard let path = Bundle.frameworkBundle.path(forResource: "LineSDK", ofType: "bundle"),
let bundle = Bundle(path: path) else
{
Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Friendship/LineSDKGetBotFriendshipStatusResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/General/LineSDKErrorConstant.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/LineSDKUI/LineSDKLoginButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/LineSDKUI/SharingUI/LineSDKMessageShareAuthorizationStatus.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/LineSDKUI/SharingUI/LineSDKMessageShareTargetType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/LineSDKUI/SharingUI/LineSDKShareTarget.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/LineSDKUI/SharingUI/LineSDKShareViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//

import UIKit
#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/LineSDKUI/SharingUI/LineSDKShareViewControllerDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/LineSDKLoginManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//

import UIKit
#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/LineSDKLoginManagerOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/LineSDKLoginPermission.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/LineSDKLoginProcess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/LineSDKLoginResult.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/Model/LineSDKAccessToken.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/Model/LineSDKAccessTokenStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/Model/LineSDKAccessTokenVerifyResult.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/Model/LineSDKJWT.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Login/Model/LineSDKUserProfile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Messaging/Actions/LineSDKMessageAction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion LineSDK/LineSDKObjC/Messaging/Flex/Component/LineSDKFlexBoxComponent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

#if !LineSDKCocoaPods
#if !LineSDKCocoaPods && !LineSDKXCFramework
import LineSDK
#endif

Expand Down