Skip to content

Commit

Permalink
Replaces frameworks with static libraries
Browse files Browse the repository at this point in the history
As of iOS 13.3.1, apps installed with free developer accounts that contain embedded frameworks fail to launch. To work around this, we now link all dependencies via Cocoapods as static libraries.
  • Loading branch information
rileytestut committed Feb 4, 2020
1 parent 82bfbd0 commit 6cca0f2
Show file tree
Hide file tree
Showing 1,647 changed files with 133,358 additions and 1,277 deletions.
2 changes: 1 addition & 1 deletion Cores/NESDeltaCore
162 changes: 68 additions & 94 deletions Delta.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

125 changes: 5 additions & 120 deletions Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -14,120 +14,8 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFADAFF719AE7BB70050CF31"
BuildableName = "Roxas.framework"
BlueprintName = "Roxas"
ReferencedContainer = "container:External/Roxas/Roxas.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFA1C8D31ECD01C100DEA99D"
BuildableName = "Harmony.framework"
BlueprintName = "Harmony"
ReferencedContainer = "container:External/Harmony/Harmony.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFECF9F82016982D0012B9FC"
BuildableName = "Harmony_Drive.framework"
BlueprintName = "Harmony-Drive"
ReferencedContainer = "container:External/Harmony/Backends/Drive/Harmony-Drive.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BF46895C1AACF36800A2586D"
BuildableName = "DeltaCore.framework"
BlueprintName = "DeltaCore"
ReferencedContainer = "container:Cores/DeltaCore/DeltaCore.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BF3C12F220438F3F0079A4B5"
BuildableName = "NESDeltaCore.framework"
BlueprintName = "NESDeltaCore"
ReferencedContainer = "container:Cores/NESDeltaCore/NESDeltaCore.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BF9F4FDB1AAD8070004C9500"
BuildableName = "SNESDeltaCore.framework"
BlueprintName = "SNESDeltaCore"
ReferencedContainer = "container:Cores/SNESDeltaCore/SNESDeltaCore.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BF8F2AAD1E9C879300F89F15"
BuildableName = "GBCDeltaCore.framework"
BlueprintName = "GBCDeltaCore"
ReferencedContainer = "container:Cores/GBCDeltaCore/GBCDeltaCore.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFE8E9C91D010AF7009D623D"
BuildableName = "GBADeltaCore.framework"
BlueprintName = "GBADeltaCore"
ReferencedContainer = "container:Cores/GBADeltaCore/GBADeltaCore.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1AC0A77D7D4F472C1693D90C57B90DD5"
BuildableName = "Pods_Delta.framework"
BlueprintIdentifier = "33C94426DAF58519DC6806AF4C44C9E7"
BuildableName = "libPods-Delta.a"
BlueprintName = "Pods-Delta"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
Expand All @@ -153,8 +41,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -164,13 +50,14 @@
ReferencedContainer = "container:Delta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableASanStackUseAfterReturn = "YES"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down Expand Up @@ -208,8 +95,6 @@
isEnabled = "NO">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
2 changes: 1 addition & 1 deletion Delta/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import UIKit

import DeltaCore
import Harmony_Dropbox
import Harmony

import Fabric
import Crashlytics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import AVFoundation

import DeltaCore

Expand Down
1 change: 0 additions & 1 deletion Delta/Settings/Syncing/SyncingServicesViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import UIKit

import Harmony
import Harmony_Drive

import Roxas

Expand Down
2 changes: 0 additions & 2 deletions Delta/Syncing/SyncManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
//

import Harmony
import Harmony_Drive
import Harmony_Dropbox

private extension UserDefaults
{
Expand Down
2 changes: 1 addition & 1 deletion External/Harmony
17 changes: 14 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
platform :ios, '10.0'
platform :ios, '12.0'

use_frameworks!
inhibit_all_warnings!

target 'Delta' do
pod 'SQLite.swift', '~> 0.11.0'
use_modular_headers!

pod 'SQLite.swift', '~> 0.12.0'
pod 'SDWebImage', '~> 3.8'
pod 'Fabric', '~> 1.6.0'
pod 'Crashlytics', '~> 3.8.0'
pod 'SMCalloutView'

pod 'DeltaCore', :path => 'Cores/DeltaCore'
pod 'NESDeltaCore', :path => 'Cores/NESDeltaCore'
pod 'SNESDeltaCore', :path => 'Cores/SNESDeltaCore'
pod 'N64DeltaCore', :path => 'Cores/N64DeltaCore'
pod 'GBCDeltaCore', :path => 'Cores/GBCDeltaCore'
pod 'GBADeltaCore', :path => 'Cores/GBADeltaCore'
pod 'DSDeltaCore', :path => 'Cores/DSDeltaCore'
pod 'Roxas', :path => 'External/Roxas'
pod 'Harmony', :path => 'External/Harmony'
end
Loading

0 comments on commit 6cca0f2

Please sign in to comment.