neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-16 18:23:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moves @Managed to AltStoreCore

Browse Source 
# Conflicts:
#	AltStore.xcodeproj/project.pbxproj
This commit is contained in:
Riley Testut
2022-11-23 18:08:48 -06:00
parent 4278e7db2b
commit ca9c0596f8
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AltStore.xcodeproj/project.pbxproj
View File

@@ -228,7 +228,6 @@
BFAECC5F2501B0BF00528F27 /* ALTConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = BFD52BD222A06EFB000B7ED1 /* ALTConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; BFAECC5F2501B0BF00528F27 /* ALTConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = BFD52BD222A06EFB000B7ED1 /* ALTConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
BFAECC602501B0BF00528F27 /* NSError+ALTServerError.h in Headers */ = {isa = PBXBuildFile; fileRef = BF1E314822A060F400370A3C /* NSError+ALTServerError.h */; settings = {ATTRIBUTES = (Public, ); }; }; BFAECC602501B0BF00528F27 /* NSError+ALTServerError.h in Headers */ = {isa = PBXBuildFile; fileRef = BF1E314822A060F400370A3C /* NSError+ALTServerError.h */; settings = {ATTRIBUTES = (Public, ); }; };
BFB3645A2325985F00CD0EB1 /* FindServerOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFB364592325985F00CD0EB1 /* FindServerOperation.swift */; }; BFB3645A2325985F00CD0EB1 /* FindServerOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFB364592325985F00CD0EB1 /* FindServerOperation.swift */; };
BFB39B5C252BC10E00D1BE50 /* Managed.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFB39B5B252BC10E00D1BE50 /* Managed.swift */; };
BFB4323F22DE852000B7F8BC /* UpdateCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFB4323E22DE852000B7F8BC /* UpdateCollectionViewCell.xib */; }; BFB4323F22DE852000B7F8BC /* UpdateCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFB4323E22DE852000B7F8BC /* UpdateCollectionViewCell.xib */; };
BFB49AAA23834CF900D542D9 /* ALTAnisetteData.m in Sources */ = {isa = PBXBuildFile; fileRef = BFB49AA823834CF900D542D9 /* ALTAnisetteData.m */; }; BFB49AAA23834CF900D542D9 /* ALTAnisetteData.m in Sources */ = {isa = PBXBuildFile; fileRef = BFB49AA823834CF900D542D9 /* ALTAnisetteData.m */; };
BFB6B21E231870160022A802 /* NewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFB6B21D231870160022A802 /* NewsViewController.swift */; }; BFB6B21E231870160022A802 /* NewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFB6B21D231870160022A802 /* NewsViewController.swift */; };
@@ -349,6 +348,7 @@
D51AD27E29356B7B00967AAA /* ALTWrappedError.h in Headers */ = {isa = PBXBuildFile; fileRef = D51AD27C29356B7B00967AAA /* ALTWrappedError.h */; settings = {ATTRIBUTES = (Public, ); }; }; D51AD27E29356B7B00967AAA /* ALTWrappedError.h in Headers */ = {isa = PBXBuildFile; fileRef = D51AD27C29356B7B00967AAA /* ALTWrappedError.h */; settings = {ATTRIBUTES = (Public, ); }; };
D51AD27F29356B7B00967AAA /* ALTWrappedError.m in Sources */ = {isa = PBXBuildFile; fileRef = D51AD27D29356B7B00967AAA /* ALTWrappedError.m */; }; D51AD27F29356B7B00967AAA /* ALTWrappedError.m in Sources */ = {isa = PBXBuildFile; fileRef = D51AD27D29356B7B00967AAA /* ALTWrappedError.m */; };
D51AD28029356B8000967AAA /* ALTWrappedError.m in Sources */ = {isa = PBXBuildFile; fileRef = D51AD27D29356B7B00967AAA /* ALTWrappedError.m */; }; D51AD28029356B8000967AAA /* ALTWrappedError.m in Sources */ = {isa = PBXBuildFile; fileRef = D51AD27D29356B7B00967AAA /* ALTWrappedError.m */; };
D519AD46292D665B004B12F9 /* Managed.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFB39B5B252BC10E00D1BE50 /* Managed.swift */; };
D52C08EE28AEC37A006C4AE5 /* AppVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = D52C08ED28AEC37A006C4AE5 /* AppVersion.swift */; }; D52C08EE28AEC37A006C4AE5 /* AppVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = D52C08ED28AEC37A006C4AE5 /* AppVersion.swift */; };
D533E8B72727841800A9B5DD /* libAppleArchive.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D533E8B62727841800A9B5DD /* libAppleArchive.tbd */; settings = {ATTRIBUTES = (Weak, ); }; }; D533E8B72727841800A9B5DD /* libAppleArchive.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D533E8B62727841800A9B5DD /* libAppleArchive.tbd */; settings = {ATTRIBUTES = (Weak, ); }; };
D533E8BC2727BBEE00A9B5DD /* libfragmentzip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D533E8BB2727BBEE00A9B5DD /* libfragmentzip.a */; }; D533E8BC2727BBEE00A9B5DD /* libfragmentzip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D533E8BB2727BBEE00A9B5DD /* libfragmentzip.a */; };
@@ -1019,7 +1019,6 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
BF41B807233433C100C593A3 /* LoadingState.swift */, BF41B807233433C100C593A3 /* LoadingState.swift */,
BFB39B5B252BC10E00D1BE50 /* Managed.swift */,
D5DAE0932804B0B80034D8D4 /* ScreenshotProcessor.swift */, D5DAE0932804B0B80034D8D4 /* ScreenshotProcessor.swift */,
); );
path = Types; path = Types;
@@ -1259,6 +1258,7 @@
BF66EE8D2501AEBC007EE018 /* Types */ = { BF66EE8D2501AEBC007EE018 /* Types */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
BFB39B5B252BC10E00D1BE50 /* Managed.swift */,
BF66EE8E2501AEBC007EE018 /* ALTAppPermission.h */, BF66EE8E2501AEBC007EE018 /* ALTAppPermission.h */,
BF66EE912501AEBC007EE018 /* ALTAppPermission.m */, BF66EE912501AEBC007EE018 /* ALTAppPermission.m */,
BF66EE922501AEBC007EE018 /* ALTPatreonBenefitType.h */, BF66EE922501AEBC007EE018 /* ALTPatreonBenefitType.h */,
@@ -2551,6 +2551,7 @@
BFAECC532501B0A400528F27 /* ServerProtocol.swift in Sources */, BFAECC532501B0A400528F27 /* ServerProtocol.swift in Sources */,
BFAECC572501B0A400528F27 /* ConnectionManager.swift in Sources */, BFAECC572501B0A400528F27 /* ConnectionManager.swift in Sources */,
BF66EE9D2501AEC1007EE018 /* AppProtocol.swift in Sources */, BF66EE9D2501AEC1007EE018 /* AppProtocol.swift in Sources */,
D519AD46292D665B004B12F9 /* Managed.swift in Sources */,
BFC712C42512D5F100AB5EBE /* XPCConnection.swift in Sources */, BFC712C42512D5F100AB5EBE /* XPCConnection.swift in Sources */,
D5CA0C4B280E141900469595 /* ManagedPatron.swift in Sources */, D5CA0C4B280E141900469595 /* ManagedPatron.swift in Sources */,
D5708417292448DA00D42D34 /* OperatingSystemVersion+Comparable.swift in Sources */, D5708417292448DA00D42D34 /* OperatingSystemVersion+Comparable.swift in Sources */,
@@ -2672,7 +2673,6 @@
D5F2F6A92720B7C20081CCF5 /* PatchViewController.swift in Sources */, D5F2F6A92720B7C20081CCF5 /* PatchViewController.swift in Sources */,
BF8F69C222E659F700049BA1 /* AppContentViewController.swift in Sources */, BF8F69C222E659F700049BA1 /* AppContentViewController.swift in Sources */,
BF08858522DE7EC800DE9F1E /* UpdateCollectionViewCell.swift in Sources */, BF08858522DE7EC800DE9F1E /* UpdateCollectionViewCell.swift in Sources */,
BFB39B5C252BC10E00D1BE50 /* Managed.swift in Sources */,
BF770E5822BC3D0F002A40FE /* RefreshGroup.swift in Sources */, BF770E5822BC3D0F002A40FE /* RefreshGroup.swift in Sources */,
BF18B0F122E25DF9005C4CF5 /* ToastView.swift in Sources */, BF18B0F122E25DF9005C4CF5 /* ToastView.swift in Sources */,
BF3D649F22E7B24C00E9056B /* CollapsingTextView.swift in Sources */, BF3D649F22E7B24C00E9056B /* CollapsingTextView.swift in Sources */,

12
AltStore/Types/Managed.swift → AltStoreCore/Types/Managed.swift
View File

@@ -10,15 +10,15 @@ import Foundation
import CoreData import CoreData
@propertyWrapper @dynamicMemberLookup @propertyWrapper @dynamicMemberLookup
struct Managed<ManagedObject> public struct Managed<ManagedObject>
{ {
var wrappedValue: ManagedObject { public var wrappedValue: ManagedObject {
didSet { didSet {
self.managedObjectContext = self.managedObject?.managedObjectContext self.managedObjectContext = self.managedObject?.managedObjectContext
} }
} }
var projectedValue: Managed<ManagedObject> { public var projectedValue: Managed<ManagedObject> {
return self return self
} }
@@ -27,13 +27,13 @@ struct Managed<ManagedObject>
return self.wrappedValue as? NSManagedObject return self.wrappedValue as? NSManagedObject
} }
init(wrappedValue: ManagedObject) public init(wrappedValue: ManagedObject)
{ {
self.wrappedValue = wrappedValue self.wrappedValue = wrappedValue
self.managedObjectContext = self.managedObject?.managedObjectContext self.managedObjectContext = self.managedObject?.managedObjectContext
} }
subscript<T>(dynamicMember keyPath: KeyPath<ManagedObject, T>) -> T public subscript<T>(dynamicMember keyPath: KeyPath<ManagedObject, T>) -> T
{ {
var result: T! var result: T!
@@ -52,7 +52,7 @@ struct Managed<ManagedObject>
} }
// Optionals // Optionals
subscript<Wrapped, T>(dynamicMember keyPath: KeyPath<Wrapped, T>) -> T? where ManagedObject == Optional<Wrapped> public subscript<Wrapped, T>(dynamicMember keyPath: KeyPath<Wrapped, T>) -> T? where ManagedObject == Optional<Wrapped>
{ {
var result: T? var result: T?