From 43a86bfa44c3cb31e36e7f2280a7d1f1a51d0054 Mon Sep 17 00:00:00 2001 From: rikner Date: Tue, 5 Nov 2024 12:18:59 +0100 Subject: [PATCH 1/4] xcode project: remove CJNI target --- JNI.xcodeproj/project.pbxproj | 152 ++-------------------------------- 1 file changed, 5 insertions(+), 147 deletions(-) diff --git a/JNI.xcodeproj/project.pbxproj b/JNI.xcodeproj/project.pbxproj index d799f44..5c8bf0b 100644 --- a/JNI.xcodeproj/project.pbxproj +++ b/JNI.xcodeproj/project.pbxproj @@ -21,28 +21,14 @@ OBJ_40 /* JNIStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_21 /* JNIStrings.swift */; }; OBJ_41 /* JavaParameterConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_22 /* JavaParameterConvertible.swift */; }; OBJ_42 /* SwiftJNI.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_23 /* SwiftJNI.swift */; }; - OBJ_44 /* CJNI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "JNI::CJNI::Product" /* CJNI.framework */; }; - OBJ_51 /* cjni.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* cjni.c */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 5C2714A61F2B6DC70026BBA9 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = OBJ_1 /* Project object */; - proxyType = 1; - remoteGlobalIDString = "JNI::CJNI"; - remoteInfo = CJNI; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 034A7B8D1F30D18A0071A850 /* JNIFields.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIFields.swift; sourceTree = ""; }; 5C1AD86F273C494F00195C8A /* isMainThread.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = isMainThread.swift; sourceTree = ""; }; 5CFFF4332016125400D989BC /* JavaParameterConvertible+Objects.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JavaParameterConvertible+Objects.swift"; sourceTree = ""; }; 5CFFF4342016125500D989BC /* JavaParameterConvertible+Primitives.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JavaParameterConvertible+Primitives.swift"; sourceTree = ""; }; - "JNI::CJNI::Product" /* CJNI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CJNI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - "JNI::JNI::Product" /* JNI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JNI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - OBJ_11 /* jni.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = jni.h; sourceTree = ""; }; + "JNI::JNI::Product" /* JNI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JNI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; OBJ_14 /* Array+JavaParameterConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+JavaParameterConvertible.swift"; sourceTree = ""; }; OBJ_15 /* JNI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNI.swift; sourceTree = ""; }; OBJ_16 /* JNIClassManipulation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIClassManipulation.swift; sourceTree = ""; }; @@ -54,19 +40,10 @@ OBJ_22 /* JavaParameterConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JavaParameterConvertible.swift; sourceTree = ""; }; OBJ_23 /* SwiftJNI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftJNI.swift; sourceTree = ""; }; OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; - OBJ_9 /* cjni.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cjni.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ OBJ_43 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 0; - files = ( - OBJ_44 /* CJNI.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - OBJ_52 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 0; files = ( @@ -76,14 +53,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - OBJ_10 /* include */ = { - isa = PBXGroup; - children = ( - OBJ_11 /* jni.h */, - ); - path = include; - sourceTree = ""; - }; OBJ_13 /* JNI */ = { isa = PBXGroup; children = ( @@ -117,7 +86,6 @@ isa = PBXGroup; children = ( "JNI::JNI::Product" /* JNI.framework */, - "JNI::CJNI::Product" /* CJNI.framework */, ); name = Products; sourceTree = BUILT_PRODUCTS_DIR; @@ -135,41 +103,14 @@ OBJ_7 /* Sources */ = { isa = PBXGroup; children = ( - OBJ_8 /* CJNI */, OBJ_13 /* JNI */, ); name = Sources; sourceTree = SOURCE_ROOT; }; - OBJ_8 /* CJNI */ = { - isa = PBXGroup; - children = ( - OBJ_9 /* cjni.c */, - OBJ_10 /* include */, - ); - name = CJNI; - path = Sources/CJNI; - sourceTree = SOURCE_ROOT; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - "JNI::CJNI" /* CJNI */ = { - isa = PBXNativeTarget; - buildConfigurationList = OBJ_47 /* Build configuration list for PBXNativeTarget "CJNI" */; - buildPhases = ( - OBJ_50 /* Sources */, - OBJ_52 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = CJNI; - productName = CJNI; - productReference = "JNI::CJNI::Product" /* CJNI.framework */; - productType = "com.apple.product-type.framework"; - }; "JNI::JNI" /* JNI */ = { isa = PBXNativeTarget; buildConfigurationList = OBJ_29 /* Build configuration list for PBXNativeTarget "JNI" */; @@ -180,7 +121,6 @@ buildRules = ( ); dependencies = ( - OBJ_45 /* PBXTargetDependency */, ); name = JNI; productName = JNI; @@ -209,7 +149,6 @@ projectRoot = ""; targets = ( "JNI::JNI" /* JNI */, - "JNI::CJNI" /* CJNI */, ); }; /* End PBXProject section */ @@ -236,24 +175,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - OBJ_50 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 0; - files = ( - OBJ_51 /* cjni.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - OBJ_45 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = "JNI::CJNI" /* CJNI */; - targetProxy = 5C2714A61F2B6DC70026BBA9 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ OBJ_3 /* Debug */ = { isa = XCBuildConfiguration; @@ -284,14 +207,11 @@ "$(inherited)", "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/Sources/CJNI/include", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = JNI.xcodeproj/JNI_Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=$(SRCROOT)/Sources/CJNI/include/module.modulemap"; + OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = JNI; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -309,14 +229,11 @@ "$(inherited)", "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/Sources/CJNI/include", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = JNI.xcodeproj/JNI_Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=$(SRCROOT)/Sources/CJNI/include/module.modulemap"; + OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = JNI; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -345,56 +262,6 @@ }; name = Release; }; - OBJ_48 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEFINES_MODULE = NO; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/Sources/CJNI/include", - ); - INFOPLIST_FILE = JNI.xcodeproj/CJNI_Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = CJNI; - PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - TARGET_NAME = CJNI; - }; - name = Debug; - }; - OBJ_49 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEFINES_MODULE = NO; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/Sources/CJNI/include", - ); - INFOPLIST_FILE = JNI.xcodeproj/CJNI_Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = CJNI; - PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - TARGET_NAME = CJNI; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -416,15 +283,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - OBJ_47 /* Build configuration list for PBXNativeTarget "CJNI" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - OBJ_48 /* Debug */, - OBJ_49 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = OBJ_1 /* Project object */; From 1c56680b1d874819c2d6ec75862b31d00689a125 Mon Sep 17 00:00:00 2001 From: rikner Date: Tue, 5 Nov 2024 17:12:23 +0100 Subject: [PATCH 2/4] remove xcode project and and CJNI target from Package.swift --- .DS_Store | Bin 0 -> 6148 bytes .../contents.xcworkspacedata | 0 JNI.xcodeproj/CJNI_Info.plist | 25 -- JNI.xcodeproj/JNI_Info.plist | 25 -- JNI.xcodeproj/project.pbxproj | 289 ------------------ .../xcschemes/xcschememanagement.plist | 12 - Package.swift | 5 +- Sources/.DS_Store | Bin 0 -> 8196 bytes Sources/JNI/JNI.swift | 2 + Sources/JNI/isMainThread.swift | 7 - 10 files changed, 4 insertions(+), 361 deletions(-) create mode 100644 .DS_Store rename {JNI.xcodeproj/project.xcworkspace => .swiftpm/xcode/package.xcworkspace}/contents.xcworkspacedata (100%) delete mode 100644 JNI.xcodeproj/CJNI_Info.plist delete mode 100644 JNI.xcodeproj/JNI_Info.plist delete mode 100644 JNI.xcodeproj/project.pbxproj delete mode 100644 JNI.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist create mode 100644 Sources/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1d4ac88b6ead0768782ca5fc54d9bbbc0a5e4592 GIT binary patch literal 6148 zcmeHK%T59@6g^d9Fvf(X?k4VaWb0}q;{r6qNOUbP6$FOB;A1ym=TG<##!v9vwjmG{ z!p0bLZ_=LI+k5&rB~uE(lqRhrPymo;5!~2j^^Hltlm*-Hku9RJW4xe=1TC~NT*%hI zUsOQOZWk3)QN|Hw&u_$&?Dp=9wPw=yr}=)hJiDL7aifD%imz zo^51c>kxNjCXB^wKao+j+z$OVF4Fp)#8RRL9CUV%;5 zEXe(T_VfFHo}?{RKo$5`3Yc76i%Z;+zgrhJCwFbYa?2tnd6~m0g^s<7nJZWE9*Z@` Y196Cv$IKxkH2ouBWzb3$_*DhI00Hx7bN~PV literal 0 HcmV?d00001 diff --git a/JNI.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata similarity index 100% rename from JNI.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/JNI.xcodeproj/CJNI_Info.plist b/JNI.xcodeproj/CJNI_Info.plist deleted file mode 100644 index 57ada9f..0000000 --- a/JNI.xcodeproj/CJNI_Info.plist +++ /dev/null @@ -1,25 +0,0 @@ - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/JNI.xcodeproj/JNI_Info.plist b/JNI.xcodeproj/JNI_Info.plist deleted file mode 100644 index 57ada9f..0000000 --- a/JNI.xcodeproj/JNI_Info.plist +++ /dev/null @@ -1,25 +0,0 @@ - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/JNI.xcodeproj/project.pbxproj b/JNI.xcodeproj/project.pbxproj deleted file mode 100644 index 5c8bf0b..0000000 --- a/JNI.xcodeproj/project.pbxproj +++ /dev/null @@ -1,289 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 034A7B8E1F30D18A0071A850 /* JNIFields.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034A7B8D1F30D18A0071A850 /* JNIFields.swift */; }; - 5C1AD870273C494F00195C8A /* isMainThread.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1AD86F273C494F00195C8A /* isMainThread.swift */; }; - 5CFFF4352016125500D989BC /* JavaParameterConvertible+Objects.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFFF4332016125400D989BC /* JavaParameterConvertible+Objects.swift */; }; - 5CFFF4362016125500D989BC /* JavaParameterConvertible+Primitives.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFFF4342016125500D989BC /* JavaParameterConvertible+Primitives.swift */; }; - OBJ_33 /* Array+JavaParameterConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* Array+JavaParameterConvertible.swift */; }; - OBJ_34 /* JNI.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* JNI.swift */; }; - OBJ_35 /* JNIClassManipulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* JNIClassManipulation.swift */; }; - OBJ_36 /* JNIExceptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* JNIExceptions.swift */; }; - OBJ_37 /* JNIMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_18 /* JNIMethods.swift */; }; - OBJ_38 /* JNIObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* JNIObjects.swift */; }; - OBJ_39 /* JNIRefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_20 /* JNIRefs.swift */; }; - OBJ_40 /* JNIStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_21 /* JNIStrings.swift */; }; - OBJ_41 /* JavaParameterConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_22 /* JavaParameterConvertible.swift */; }; - OBJ_42 /* SwiftJNI.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_23 /* SwiftJNI.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 034A7B8D1F30D18A0071A850 /* JNIFields.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIFields.swift; sourceTree = ""; }; - 5C1AD86F273C494F00195C8A /* isMainThread.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = isMainThread.swift; sourceTree = ""; }; - 5CFFF4332016125400D989BC /* JavaParameterConvertible+Objects.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JavaParameterConvertible+Objects.swift"; sourceTree = ""; }; - 5CFFF4342016125500D989BC /* JavaParameterConvertible+Primitives.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JavaParameterConvertible+Primitives.swift"; sourceTree = ""; }; - "JNI::JNI::Product" /* JNI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JNI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - OBJ_14 /* Array+JavaParameterConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+JavaParameterConvertible.swift"; sourceTree = ""; }; - OBJ_15 /* JNI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNI.swift; sourceTree = ""; }; - OBJ_16 /* JNIClassManipulation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIClassManipulation.swift; sourceTree = ""; }; - OBJ_17 /* JNIExceptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIExceptions.swift; sourceTree = ""; }; - OBJ_18 /* JNIMethods.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIMethods.swift; sourceTree = ""; }; - OBJ_19 /* JNIObjects.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIObjects.swift; sourceTree = ""; }; - OBJ_20 /* JNIRefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIRefs.swift; sourceTree = ""; }; - OBJ_21 /* JNIStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JNIStrings.swift; sourceTree = ""; }; - OBJ_22 /* JavaParameterConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JavaParameterConvertible.swift; sourceTree = ""; }; - OBJ_23 /* SwiftJNI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftJNI.swift; sourceTree = ""; }; - OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - OBJ_43 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - OBJ_13 /* JNI */ = { - isa = PBXGroup; - children = ( - OBJ_14 /* Array+JavaParameterConvertible.swift */, - OBJ_15 /* JNI.swift */, - OBJ_16 /* JNIClassManipulation.swift */, - OBJ_17 /* JNIExceptions.swift */, - 034A7B8D1F30D18A0071A850 /* JNIFields.swift */, - OBJ_18 /* JNIMethods.swift */, - OBJ_19 /* JNIObjects.swift */, - OBJ_20 /* JNIRefs.swift */, - OBJ_21 /* JNIStrings.swift */, - OBJ_22 /* JavaParameterConvertible.swift */, - 5CFFF4332016125400D989BC /* JavaParameterConvertible+Objects.swift */, - 5CFFF4342016125500D989BC /* JavaParameterConvertible+Primitives.swift */, - OBJ_23 /* SwiftJNI.swift */, - 5C1AD86F273C494F00195C8A /* isMainThread.swift */, - ); - name = JNI; - path = Sources/JNI; - sourceTree = SOURCE_ROOT; - }; - OBJ_24 /* Tests */ = { - isa = PBXGroup; - children = ( - ); - name = Tests; - sourceTree = SOURCE_ROOT; - }; - OBJ_25 /* Products */ = { - isa = PBXGroup; - children = ( - "JNI::JNI::Product" /* JNI.framework */, - ); - name = Products; - sourceTree = BUILT_PRODUCTS_DIR; - }; - OBJ_5 = { - isa = PBXGroup; - children = ( - OBJ_6 /* Package.swift */, - OBJ_7 /* Sources */, - OBJ_24 /* Tests */, - OBJ_25 /* Products */, - ); - sourceTree = ""; - }; - OBJ_7 /* Sources */ = { - isa = PBXGroup; - children = ( - OBJ_13 /* JNI */, - ); - name = Sources; - sourceTree = SOURCE_ROOT; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - "JNI::JNI" /* JNI */ = { - isa = PBXNativeTarget; - buildConfigurationList = OBJ_29 /* Build configuration list for PBXNativeTarget "JNI" */; - buildPhases = ( - OBJ_32 /* Sources */, - OBJ_43 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = JNI; - productName = JNI; - productReference = "JNI::JNI::Product" /* JNI.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - OBJ_1 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 9999; - }; - buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "JNI" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - English, - en, - ); - mainGroup = OBJ_5; - productRefGroup = OBJ_25 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - "JNI::JNI" /* JNI */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - OBJ_32 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 0; - files = ( - OBJ_33 /* Array+JavaParameterConvertible.swift in Sources */, - OBJ_34 /* JNI.swift in Sources */, - 5CFFF4352016125500D989BC /* JavaParameterConvertible+Objects.swift in Sources */, - OBJ_35 /* JNIClassManipulation.swift in Sources */, - OBJ_36 /* JNIExceptions.swift in Sources */, - OBJ_37 /* JNIMethods.swift in Sources */, - 034A7B8E1F30D18A0071A850 /* JNIFields.swift in Sources */, - OBJ_38 /* JNIObjects.swift in Sources */, - 5C1AD870273C494F00195C8A /* isMainThread.swift in Sources */, - 5CFFF4362016125500D989BC /* JavaParameterConvertible+Primitives.swift in Sources */, - OBJ_39 /* JNIRefs.swift in Sources */, - OBJ_40 /* JNIStrings.swift in Sources */, - OBJ_41 /* JavaParameterConvertible.swift in Sources */, - OBJ_42 /* SwiftJNI.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - OBJ_3 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - MACOSX_DEPLOYMENT_TARGET = 10.15; - ONLY_ACTIVE_ARCH = YES; - OTHER_SWIFT_FLAGS = "-DXcode"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - USE_HEADERMAP = NO; - }; - name = Debug; - }; - OBJ_30 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = JNI.xcodeproj/JNI_Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = JNI; - PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; - TARGET_NAME = JNI; - }; - name = Debug; - }; - OBJ_31 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = JNI.xcodeproj/JNI_Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; - OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = JNI; - PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; - TARGET_NAME = JNI; - }; - name = Release; - }; - OBJ_4 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_OPTIMIZATION_LEVEL = s; - MACOSX_DEPLOYMENT_TARGET = 10.15; - OTHER_SWIFT_FLAGS = "-DXcode"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - USE_HEADERMAP = NO; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - OBJ_2 /* Build configuration list for PBXProject "JNI" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - OBJ_3 /* Debug */, - OBJ_4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - OBJ_29 /* Build configuration list for PBXNativeTarget "JNI" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - OBJ_30 /* Debug */, - OBJ_31 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = OBJ_1 /* Project object */; -} diff --git a/JNI.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist b/JNI.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist deleted file mode 100644 index f212055..0000000 --- a/JNI.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,12 +0,0 @@ - - - - SchemeUserState - - JNI-Package.xcscheme - - - SuppressBuildableAutocreation - - - diff --git a/Package.swift b/Package.swift index ed5c6c4..9524845 100644 --- a/Package.swift +++ b/Package.swift @@ -5,10 +5,9 @@ import PackageDescription let package = Package( name: "JNI", products: [ - .library(name: "JNI", targets: ["JNI", "CJNI"]) + .library(name: "JNI", targets: ["JNI"]) ], targets: [ - .target(name: "JNI", dependencies: ["CJNI"]), - .target(name: "CJNI"), + .target(name: "JNI"), ] ) diff --git a/Sources/.DS_Store b/Sources/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2e0dc2e4c37544d796b17983b500120776b4cfab GIT binary patch literal 8196 zcmeHMU2GIp6u#fIzziMe07Vwu2@8cFWP#EaTmH=UPbohwur1w|pJjGuv;)(bvNPKj zN@HW<3kb$1jsHApH1c3Ti7!5=h(0QsV2lq$jrxL#zNkESX6`J~7UGLB3UiZt&pqd! zbMKrp-CfA(WI61=%xqFlRYA;x6U}r)Wol zC<0Lgq6kD0h$0Y0;J*+7+Oz#4-eKS8qfr}0Ad0{}83F(Mkf7?*R7l4;4L%*z1V;d( z(jBR5btUWh;>-pU>U9YC*O9*A<)27c5MX^FWknVSe)1KxP z-Da(@&*!=v$I6xZT5hjt3}=<97RUB9(>4l$fvFp$vcJc)b!WKQDcZUl*rxe_C`nRQ ziH(k~uU(%^)Ya6FB@?3?YHN~-`nm_l#w2lm_1aB)vPY}|+d0V{K==`0vnDxo>Mw6B zcc_KmMwF#lrd#GiMoHwl-kQK~j>gRK^xAx<9U}cT&w1bLP>a z=^az5MKM?-u|$>k>-0=J9o=6=S1yP&53Rm@iK_1NM_LL7wR&im8@p+&cFb<=!UYUW>r1t zFS|o?z0N_yrboIQuKh5L^|}38!RQ<&0EW_SBn@6E$$g_X-SnJbkfPB+UiA9YHR*cb z!=l*2N;R!^i^^wWR#8lQ$RyCyYvtG%t5b3Qa;j6S!cOUB1%a+k)o@;-O-*IBtd;Fx zhggA)veWE2c9xxIAF)g93-%5BkzHrM0hkU6Gf{ymEW$D*u^tU*#0E5@6T7hoY3xTo zOdN)b5gf-TPT)zL#8WtpGk6v+;T61!vv>n<<2)|l9lVdr_ynKgb6mr>_zvIWI)29= zxFJjv76>t6p|Dg)3af=RLW9sKY!o&L9YUv&5j5ej;0Pn!0il#=2TBfx@?%89&jux0 zcgyM3a?AKBWzZTtTx(XP(ssWtz;1&QUW*48&}X}SqPj@c4SZv}sV_z8IuAU;6E zB(z@PIVdkK<>%yN?50#PMnpejl^I-nsk}_2R8gjJc7?oBq$E+Mb2b@YBT`x_Lcq%F z;&l=wpHjxzWV}HV6>w&wyjh|&RLVK4$|*@wSir;_?c zHs&FQ6{sO(KZLF5AZ+`{?#4l6p&qP$Ev zKTwLAC<0Lg?#>9Hyfxk0Oum(N`^j$lXYB;lLsb3Z>y2|7m{2p}B7pdte;86fL8`t@ cDx~9_l7z~?ei88ZKeVI$KidBTY~IbypCGSS#sB~S literal 0 HcmV?d00001 diff --git a/Sources/JNI/JNI.swift b/Sources/JNI/JNI.swift index a571d11..b41e6e0 100644 --- a/Sources/JNI/JNI.swift +++ b/Sources/JNI/JNI.swift @@ -1,4 +1,6 @@ +#if canImport(Android) import Android +#endif public class JNI { /// Our reference to the Java Virtual Machine, to be set on init diff --git a/Sources/JNI/isMainThread.swift b/Sources/JNI/isMainThread.swift index d68a130..2ec3eec 100644 --- a/Sources/JNI/isMainThread.swift +++ b/Sources/JNI/isMainThread.swift @@ -7,11 +7,4 @@ public func syscallNonVariadic(_ number: Int) -> Int public var isMainThread: Bool { return syscallNonVariadic(Int(SYS_gettid)) == getpid() } -#elseif canImport(Darwin) -import Darwin -import Foundation // free on Darwin, expensive elsewhere - -public var isMainThread: Bool { - return Thread.isMainThread -} #endif From 3c5199798d2699365e87d7c575a1868124a3227f Mon Sep 17 00:00:00 2001 From: rikner Date: Tue, 5 Nov 2024 17:12:33 +0100 Subject: [PATCH 3/4] unconditionally import Android --- Sources/JNI/JNI.swift | 2 -- Sources/JNI/isMainThread.swift | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Sources/JNI/JNI.swift b/Sources/JNI/JNI.swift index b41e6e0..a571d11 100644 --- a/Sources/JNI/JNI.swift +++ b/Sources/JNI/JNI.swift @@ -1,6 +1,4 @@ -#if canImport(Android) import Android -#endif public class JNI { /// Our reference to the Java Virtual Machine, to be set on init diff --git a/Sources/JNI/isMainThread.swift b/Sources/JNI/isMainThread.swift index 2ec3eec..2319620 100644 --- a/Sources/JNI/isMainThread.swift +++ b/Sources/JNI/isMainThread.swift @@ -1,4 +1,3 @@ -#if canImport(Android) import Android @_silgen_name("syscall") @@ -6,5 +5,4 @@ public func syscallNonVariadic(_ number: Int) -> Int public var isMainThread: Bool { return syscallNonVariadic(Int(SYS_gettid)) == getpid() -} -#endif +} \ No newline at end of file From 6d0b5d100445fa825de4d902f04844905ab4bbab Mon Sep 17 00:00:00 2001 From: rikner Date: Wed, 6 Nov 2024 09:58:40 +0100 Subject: [PATCH 4/4] cleanup --- .DS_Store | Bin 6148 -> 0 bytes .../package.xcworkspace/contents.xcworkspacedata | 7 ------- Sources/.DS_Store | Bin 8196 -> 0 bytes 3 files changed, 7 deletions(-) delete mode 100644 .DS_Store delete mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata delete mode 100644 Sources/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 1d4ac88b6ead0768782ca5fc54d9bbbc0a5e4592..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%T59@6g^d9Fvf(X?k4VaWb0}q;{r6qNOUbP6$FOB;A1ym=TG<##!v9vwjmG{ z!p0bLZ_=LI+k5&rB~uE(lqRhrPymo;5!~2j^^Hltlm*-Hku9RJW4xe=1TC~NT*%hI zUsOQOZWk3)QN|Hw&u_$&?Dp=9wPw=yr}=)hJiDL7aifD%imz zo^51c>kxNjCXB^wKao+j+z$OVF4Fp)#8RRL9CUV%;5 zEXe(T_VfFHo}?{RKo$5`3Yc76i%Z;+zgrhJCwFbYa?2tnd6~m0g^s<7nJZWE9*Z@` Y196Cv$IKxkH2ouBWzb3$_*DhI00Hx7bN~PV diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Sources/.DS_Store b/Sources/.DS_Store deleted file mode 100644 index 2e0dc2e4c37544d796b17983b500120776b4cfab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIp6u#fIzziMe07Vwu2@8cFWP#EaTmH=UPbohwur1w|pJjGuv;)(bvNPKj zN@HW<3kb$1jsHApH1c3Ti7!5=h(0QsV2lq$jrxL#zNkESX6`J~7UGLB3UiZt&pqd! zbMKrp-CfA(WI61=%xqFlRYA;x6U}r)Wol zC<0Lgq6kD0h$0Y0;J*+7+Oz#4-eKS8qfr}0Ad0{}83F(Mkf7?*R7l4;4L%*z1V;d( z(jBR5btUWh;>-pU>U9YC*O9*A<)27c5MX^FWknVSe)1KxP z-Da(@&*!=v$I6xZT5hjt3}=<97RUB9(>4l$fvFp$vcJc)b!WKQDcZUl*rxe_C`nRQ ziH(k~uU(%^)Ya6FB@?3?YHN~-`nm_l#w2lm_1aB)vPY}|+d0V{K==`0vnDxo>Mw6B zcc_KmMwF#lrd#GiMoHwl-kQK~j>gRK^xAx<9U}cT&w1bLP>a z=^az5MKM?-u|$>k>-0=J9o=6=S1yP&53Rm@iK_1NM_LL7wR&im8@p+&cFb<=!UYUW>r1t zFS|o?z0N_yrboIQuKh5L^|}38!RQ<&0EW_SBn@6E$$g_X-SnJbkfPB+UiA9YHR*cb z!=l*2N;R!^i^^wWR#8lQ$RyCyYvtG%t5b3Qa;j6S!cOUB1%a+k)o@;-O-*IBtd;Fx zhggA)veWE2c9xxIAF)g93-%5BkzHrM0hkU6Gf{ymEW$D*u^tU*#0E5@6T7hoY3xTo zOdN)b5gf-TPT)zL#8WtpGk6v+;T61!vv>n<<2)|l9lVdr_ynKgb6mr>_zvIWI)29= zxFJjv76>t6p|Dg)3af=RLW9sKY!o&L9YUv&5j5ej;0Pn!0il#=2TBfx@?%89&jux0 zcgyM3a?AKBWzZTtTx(XP(ssWtz;1&QUW*48&}X}SqPj@c4SZv}sV_z8IuAU;6E zB(z@PIVdkK<>%yN?50#PMnpejl^I-nsk}_2R8gjJc7?oBq$E+Mb2b@YBT`x_Lcq%F z;&l=wpHjxzWV}HV6>w&wyjh|&RLVK4$|*@wSir;_?c zHs&FQ6{sO(KZLF5AZ+`{?#4l6p&qP$Ev zKTwLAC<0Lg?#>9Hyfxk0Oum(N`^j$lXYB;lLsb3Z>y2|7m{2p}B7pdte;86fL8`t@ cDx~9_l7z~?ei88ZKeVI$KidBTY~IbypCGSS#sB~S