Skip to content

Commit e2ba0a5

Browse files
committed
Merge branch 'develop-lc' into LiveContainerSupport2
2 parents 19abbc8 + 4deda92 commit e2ba0a5

44 files changed

Lines changed: 1966 additions & 10393 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
if: steps.build_gate.outputs.should_skip != 'true'
8181
uses: maxim-lobanov/setup-xcode@v1.6.0
8282
with:
83-
xcode-version: "26.2"
83+
xcode-version: "26.4"
8484

8585
- name: Restore Cache (exact)
8686
if: steps.build_gate.outputs.should_skip != 'true'

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@
5454
path = Dependencies/em_proxy
5555
url = https://github.com/SideStore/em_proxy
5656
branch = master
57-
[submodule "Dependencies/libfragmentzip"]
58-
path = Dependencies/libfragmentzip
59-
url = https://github.com/SideStore/libfragmentzip
60-
branch = master
6157
[submodule "Dependencies/apps-v2.json"]
6258
path = Dependencies/apps-v2.json
6359
url = https://github.com/SideStore/apps-v2.json

‎AltStore.xcodeproj/project.pbxproj‎

Lines changed: 1542 additions & 8008 deletions
Large diffs are not rendered by default.

‎AltStore.xcodeproj/xcshareddata/xcschemes/em_proxy-binding.xcscheme‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

Dependencies/em_proxy.xcodeproj/xcshareddata/xcschemes/em_proxy-staticlib.xcscheme renamed to AltStore.xcodeproj/xcshareddata/xcschemes/em_proxy-swift.xcscheme

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "2620"
3+
LastUpgradeVersion = "2630"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -15,10 +15,10 @@
1515
buildForAnalyzing = "YES">
1616
<BuildableReference
1717
BuildableIdentifier = "primary"
18-
BlueprintIdentifier = "CA60C44C93D7A30E3695DD59"
19-
BuildableName = "libem_proxy_static.a"
20-
BlueprintName = "em_proxy-staticlib"
21-
ReferencedContainer = "container:em_proxy.xcodeproj">
18+
BlueprintIdentifier = "A85A51412F4B4532002E2E11"
19+
BuildableName = "libem_proxy_swift.a"
20+
BlueprintName = "em_proxy-swift"
21+
ReferencedContainer = "container:AltStore.xcodeproj">
2222
</BuildableReference>
2323
</BuildActionEntry>
2424
</BuildActionEntries>
@@ -50,10 +50,10 @@
5050
<MacroExpansion>
5151
<BuildableReference
5252
BuildableIdentifier = "primary"
53-
BlueprintIdentifier = "CA60C44C93D7A30E3695DD59"
54-
BuildableName = "libem_proxy_static.a"
55-
BlueprintName = "em_proxy-staticlib"
56-
ReferencedContainer = "container:em_proxy.xcodeproj">
53+
BlueprintIdentifier = "A85A51412F4B4532002E2E11"
54+
BuildableName = "libem_proxy_swift.a"
55+
BlueprintName = "em_proxy-swift"
56+
ReferencedContainer = "container:AltStore.xcodeproj">
5757
</BuildableReference>
5858
</MacroExpansion>
5959
</ProfileAction>

‎AltStore.xcodeproj/xcshareddata/xcschemes/minimuxer-binding.xcscheme‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎AltStore.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎AltStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎AltStore/AltStore-Bridging-Header.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,4 @@
33
//
44

55
#import "NSAttributedString+Markdown.h"
6-
#import "ALTAppPatcher.h"
7-
8-
#include "fragmentzip.h"
96
#include "../LiveContainerSupport/XPCServer.h"

‎AltStore/Browse/BrowseViewController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import AltStoreCore
1212
import Roxas
1313

1414
import Nuke
15+
import Minimuxer
1516

1617
class BrowseViewController: UICollectionViewController, PeekPopPreviewing
1718
{

0 commit comments

Comments
 (0)