Skip to content

Commit 2c0b128

Browse files
leptos-nullleptos-null
authored
Revert "Update for Xcode 14.3, use private module" (#35)
This reverts commit 556ca6f
1 parent dd60a11 commit 2c0b128

File tree

11 files changed

+23
-30
lines changed

11 files changed

+23
-30
lines changed

‎.swiftlint.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ disabled_rules:
1010
- identifier_name
1111
- type_name
1212
- blanket_disable_command
13-
analyzer_rules:
14-
- unused_import
1513
opt_in_rules:
1614
- closure_end_indentation
1715
- closure_spacing
@@ -29,6 +27,7 @@ opt_in_rules:
2927
- yoda_condition
3028
- nslocalizedstring_key
3129
- unused_setter_value
30+
- unused_import
3231
- optional_enum_case_matching
3332
- prefer_self_type_over_type_of_self
3433
- contains_over_range_nil_comparison

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ before-package::
5454

5555
internal-stage::
5656
$(ECHO_NOTHING)mkdir -p $(THEOS_PACKAGE_DIR)$(ECHO_END)
57-
$(ECHO_NOTHING)rm -rf $(SDK_DIR) $(DSYM_DIR) $(THEOS_STAGING_DIR)/Library/Frameworks/Orion.framework/{PrivateHeaders,Modules/{module.private.modulemap,Orion.swiftmodule/{*.private.swiftinterface,*.abi.json}}}$(ECHO_END)
57+
$(ECHO_NOTHING)rm -rf $(SDK_DIR) $(DSYM_DIR) $(THEOS_STAGING_DIR)/Library/Frameworks/Orion.framework/PrivateHeaders$(ECHO_END)
5858
$(ECHO_NOTHING)cp -a $(THEOS_STAGING_DIR)/Library/Frameworks/Orion.framework $(SDK_DIR)$(ECHO_END)
5959
ifeq ($(_THEOS_FINAL_PACKAGE),$(_THEOS_TRUE))
6060
$(ECHO_NOTHING)cp -a $(THEOS_OBJ_DIR)/dSYMs/Orion.framework.dSYM $(DSYM_DIR)$(ECHO_END)
@@ -64,6 +64,7 @@ endif
6464
ln -s Versions/Current/Orion.tbd $(SDK_DIR)/Orion.tbd; \
6565
rm $(SDK_DIR)/Versions/Current/Orion; \
6666
fi$(ECHO_END)
67+
$(ECHO_NOTHING)sed -i '' -e '/ORION_PRIVATE_MODULE_BEGIN/,/ORION_PRIVATE_MODULE_END/d' $(SDK_DIR)/Modules/module.modulemap$(ECHO_END)
6768
$(ECHO_NOTHING)rm $(SDK_DIR)/Orion $(SDK_DIR)/Modules/Orion.swiftmodule/*.swiftmodule$(ECHO_END)
6869
$(ECHO_NOTHING)rm -rf $(THEOS_STAGING_DIR)/Library/Frameworks/Orion.doccarchive $(THEOS_STAGING_DIR)/Library/Frameworks/Orion.framework/{Headers,Modules}$(ECHO_END)
6970

‎Orion.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 54;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -40,7 +40,6 @@
4040
562BD3272638154C003C5A00 /* orion_objcrt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = orion_objcrt.h; sourceTree = "<group>"; };
4141
562BD32A2638155A003C5A00 /* orion_objcrt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = orion_objcrt.m; sourceTree = "<group>"; };
4242
562BD32B2638155A003C5A00 /* orion_lifecycle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = orion_lifecycle.c; sourceTree = "<group>"; };
43-
562E6DF02A722D6A00ADB69E /* module.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.private.modulemap; sourceTree = "<group>"; };
4443
562FA0E225B7003E007A32FE /* Ivars+Weak.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Ivars+Weak.swift"; sourceTree = "<group>"; };
4544
565F484E25B1ED3400B75BA3 /* libsubstrate.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; path = libsubstrate.tbd; sourceTree = "<group>"; };
4645
565F485725B1F0D000B75BA3 /* libsubstrate.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; path = libsubstrate.tbd; sourceTree = "<group>"; };
@@ -245,7 +244,6 @@
245244
children = (
246245
568974D8252BBFF4006F48E9 /* Info.plist */,
247246
56D2CF9E2677AB6300F8DDBE /* module.modulemap */,
248-
562E6DF02A722D6A00ADB69E /* module.private.modulemap */,
249247
56DA77582677EECA007BDF43 /* Orion.h */,
250248
56EEA36E2621DB9F00411C46 /* Orion-Target-iphonesimulator.h */,
251249
56AF44C42621D8380041FBF6 /* Orion-Target-iphoneos.h */,
@@ -299,8 +297,7 @@
299297
56897486252BB9C6006F48E9 /* Project object */ = {
300298
isa = PBXProject;
301299
attributes = {
302-
BuildIndependentTargetsInParallel = YES;
303-
LastUpgradeCheck = 1430;
300+
LastUpgradeCheck = 1300;
304301
TargetAttributes = {
305302
5689748E252BB9C6006F48E9 = {
306303
CreatedOnToolsVersion = 12.0.1;
@@ -339,7 +336,6 @@
339336
/* Begin PBXShellScriptBuildPhase section */
340337
5648210A25C9B7C300339957 /* Build CLI if Needed */ = {
341338
isa = PBXShellScriptBuildPhase;
342-
alwaysOutOfDate = 1;
343339
buildActionMask = 2147483647;
344340
files = (
345341
);
@@ -361,7 +357,6 @@
361357
};
362358
5648211025C9BA6A00339957 /* Copy CLI if Needed */ = {
363359
isa = PBXShellScriptBuildPhase;
364-
alwaysOutOfDate = 1;
365360
buildActionMask = 2147483647;
366361
files = (
367362
);
@@ -380,7 +375,6 @@
380375
};
381376
567AF4F32536817C0056182E /* Run SwiftLint If Present */ = {
382377
isa = PBXShellScriptBuildPhase;
383-
alwaysOutOfDate = 1;
384378
buildActionMask = 2147483647;
385379
files = (
386380
);
@@ -399,7 +393,6 @@
399393
};
400394
56EEA3612621D90200411C46 /* Copy Target Header */ = {
401395
isa = PBXShellScriptBuildPhase;
402-
alwaysOutOfDate = 1;
403396
buildActionMask = 2147483647;
404397
files = (
405398
);
@@ -590,7 +583,6 @@
590583
DYLIB_COMPATIBILITY_VERSION = 1;
591584
DYLIB_CURRENT_VERSION = 1;
592585
DYLIB_INSTALL_NAME_BASE = "@rpath";
593-
ENABLE_MODULE_VERIFIER = YES;
594586
FRAMEWORK_SEARCH_PATHS = (
595587
"$(inherited)",
596588
"$(PROJECT_DIR)",
@@ -612,9 +604,6 @@
612604
MACOSX_DEPLOYMENT_TARGET = 10.14.4;
613605
MARKETING_VERSION = 1.0.1;
614606
MODULEMAP_FILE = Orion/module.modulemap;
615-
MODULEMAP_PRIVATE_FILE = Orion/module.private.modulemap;
616-
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
617-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
618607
OTHER_LDFLAGS = "-weak-lsubstrate";
619608
PRODUCT_BUNDLE_IDENTIFIER = dev.theos.orion;
620609
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -647,7 +636,6 @@
647636
DYLIB_COMPATIBILITY_VERSION = 1;
648637
DYLIB_CURRENT_VERSION = 1;
649638
DYLIB_INSTALL_NAME_BASE = "@rpath";
650-
ENABLE_MODULE_VERIFIER = YES;
651639
FRAMEWORK_SEARCH_PATHS = (
652640
"$(inherited)",
653641
"$(PROJECT_DIR)",
@@ -669,9 +657,6 @@
669657
MACOSX_DEPLOYMENT_TARGET = 10.14.4;
670658
MARKETING_VERSION = 1.0.1;
671659
MODULEMAP_FILE = Orion/module.modulemap;
672-
MODULEMAP_PRIVATE_FILE = Orion/module.private.modulemap;
673-
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
674-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
675660
OTHER_LDFLAGS = "-weak-lsubstrate";
676661
PRODUCT_BUNDLE_IDENTIFIER = dev.theos.orion;
677662
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

‎Orion.xcodeproj/xcshareddata/xcschemes/Orion.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Orion/Orion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
FOUNDATION_EXPORT double OrionVersionNumber;
44
FOUNDATION_EXPORT const unsigned char OrionVersionString[];
55

6-
#import <Orion/Orion-Target.h>
7-
#import <Orion/orion_public.h>
6+
#import "Orion-Target.h"
7+
#import "orion_public.h"

‎Orion/module.modulemap‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,14 @@ framework module Orion {
44
export *
55
module * { export * }
66
}
7+
// ORION_PRIVATE_MODULE_BEGIN
8+
9+
// ideally we would declare this as Orion_Private in a
10+
// private modulemap but Swift seems to ignore private
11+
// modulemaps.
12+
explicit module Orion.Private {
13+
header "orion_objcrt.h"
14+
header "orion_lifecycle.h"
15+
}
16+
17+
// ORION_PRIVATE_MODULE_END

‎Orion/module.private.modulemap‎

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

‎Sources/Orion/ClassHook+Deinit.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Foundation
22
#if SWIFT_PACKAGE
33
@_implementationOnly import OrionC
44
#else
5-
@_implementationOnly import Orion_Private
5+
@_implementationOnly import Orion.Private
66
#endif
77

88
/// The action to perform after a `ClassHookProtocol.deinitializer()` is run.

‎Sources/Orion/ClassHook+Super.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Foundation
22
#if SWIFT_PACKAGE
33
@_implementationOnly import OrionC
44
#else
5-
@_implementationOnly import Orion_Private
5+
@_implementationOnly import Orion.Private
66
#endif
77

88
// based on https://github.com/SSheldon/rust-objc/tree/95bce4e0d7fa99efebbd135a47cb7dec54710261/src/message/apple

‎Sources/OrionC/include/orion_lifecycle.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef ORION_LIFECYCLE_H_
22
#define ORION_LIFECYCLE_H_
33

4+
#include <orion_public.h>
5+
46
// this is only used in SPM mode but guarding it behind
57
// a conditional confuses the compiler. Don't call it yourself.
68
void _orion_init_c(void);

0 commit comments

Comments
 (0)