Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8c100b9

Browse files
committed
Rework for use in toolchain beta 2
1 parent21b56cb commit8c100b9

File tree

142 files changed

+5209
-4422
lines changed

Some content is hidden

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

142 files changed

+5209
-4422
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
1515
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
1616
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1717

18-
This License does not apply to the code generated from theApple distribution of the Java VM
18+
This License does not apply to the code generated from themacOS distribution of the Java VM
1919
which are provided under the provisions of "Fair Use" and your use is ultimately subject
2020
to the original License Agreement.

‎SwiftJava.xcodeproj/project.pbxproj

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
BB5ACFDF1D35B09900E2386A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5ACFDE1D35B09900E2386A /* AppDelegate.swift */; };
1313
BB5ACFE11D35B09900E2386A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BB5ACFE01D35B09900E2386A /* Assets.xcassets */; };
1414
BB5ACFE41D35B09900E2386A /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5ACFE21D35B09900E2386A /* MainMenu.xib */; };
15+
BB643B321F4873F7003E849E /* swift-android-gradle in Resources */ = {isa = PBXBuildFile; fileRef = BB643B311F4873F7003E849E /* swift-android-gradle */; };
1516
BB6651321F2E39F7004EFD5F /* swift-android-kotlin in Resources */ = {isa = PBXBuildFile; fileRef = BB6651301F2E39F6004EFD5F /* swift-android-kotlin */; };
1617
BB6651361F2E3F51004EFD5F /* android_toolchain in Resources */ = {isa = PBXBuildFile; fileRef = BB6651351F2E3F50004EFD5F /* android_toolchain */; };
1718
BB9CF8931D619D1C004781B9 /* genhello.sh in Resources */ = {isa = PBXBuildFile; fileRef = BB9CF8921D619D1C004781B9 /* genhello.sh */; };
@@ -223,6 +224,7 @@
223224
BB5ACFE01D35B09900E2386A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
224225
BB5ACFE31D35B09900E2386A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
225226
BB5ACFE51D35B09900E2386A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
227+
BB643B311F4873F7003E849E /* swift-android-gradle */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-gradle"; sourceTree = "<group>"; };
226228
BB6651301F2E39F6004EFD5F /* swift-android-kotlin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-kotlin"; sourceTree = "<group>"; };
227229
BB6651351F2E3F50004EFD5F /* android_toolchain */ = {isa = PBXFileReference; lastKnownFileType = folder; path = android_toolchain; sourceTree = "<group>"; };
228230
BB8AC4391D3F035700BD5B0F /* libswiftCore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCore.tbd; path = System/Library/PrivateFrameworks/Swift/libswiftCore.tbd; sourceTree = SDKROOT; };
@@ -267,14 +269,6 @@
267269
BBCD9F871D3CD05900DF5E47 /* genswift.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genswift.sh; sourceTree = "<group>"; };
268270
BBF280D81D64BC6100A7AF5D /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = "<group>"; };
269271
CE31850E1F368D44002046A6 /* SwiftHelloTypes_TextListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTypes_TextListener.swift; path = com_johnholdsworth/Sources/SwiftHelloTypes_TextListener.swift; sourceTree = SOURCE_ROOT; };
270-
CE4A24FB1F34B37C003AF384 /* JNIMethod.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JNIMethod.swift; path = java_swift/Sources/JNIMethod.swift; sourceTree = SOURCE_ROOT; };
271-
CE4A24FC1F34B37C003AF384 /* JNIType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JNIType.swift; path = java_swift/Sources/JNIType.swift; sourceTree = SOURCE_ROOT; };
272-
CE4A24FD1F34B37C003AF384 /* JNICore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JNICore.swift; path = java_swift/Sources/JNICore.swift; sourceTree = SOURCE_ROOT; };
273-
CE4A24FE1F34B37C003AF384 /* JavaClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JavaClass.swift; path = java_swift/Sources/JavaClass.swift; sourceTree = SOURCE_ROOT; };
274-
CE4A24FF1F34B37C003AF384 /* JNIObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JNIObject.swift; path = java_swift/Sources/JNIObject.swift; sourceTree = SOURCE_ROOT; };
275-
CE4A25001F34B37C003AF384 /* Runnable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Runnable.swift; path = java_swift/Sources/Runnable.swift; sourceTree = SOURCE_ROOT; };
276-
CE4A25011F34B37C003AF384 /* JavaObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JavaObject.swift; path = java_swift/Sources/JavaObject.swift; sourceTree = SOURCE_ROOT; };
277-
CE4A25021F34B37C003AF384 /* JNIField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JNIField.swift; path = java_swift/Sources/JNIField.swift; sourceTree = SOURCE_ROOT; };
278272
CE4A250F1F3555CA003AF384 /* com_johnholdsworth */ = {isa = PBXFileReference; lastKnownFileType = folder; path = com_johnholdsworth; sourceTree = "<group>"; };
279273
CE4A25131F355902003AF384 /* SwiftHelloTestImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTestImpl.swift; path = com_johnholdsworth/Sources/SwiftHelloTestImpl.swift; sourceTree = SOURCE_ROOT; };
280274
CE4A25141F355902003AF384 /* SwiftHelloTest_TestResponderAdapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTest_TestResponderAdapter.swift; path = com_johnholdsworth/Sources/SwiftHelloTest_TestResponderAdapter.swift; sourceTree = SOURCE_ROOT; };
@@ -288,9 +282,6 @@
288282
CE8102391F3693510069563B /* MainActivity.kt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MainActivity.kt; path = "swift-android-kotlin/app/src/main/java/com/example/user/myapplication/MainActivity.kt"; sourceTree = "<group>"; };
289283
CE81023B1F3693790069563B /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = "swift-android-kotlin/app/src/main/swift/Sources/main.swift"; sourceTree = "<group>"; };
290284
CE81023D1F369D8D0069563B /* SwiftHello.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftHello.java; path = "swift-android-samples/swifthello/src/main/java/net/zhuoweizhang/swifthello/SwiftHello.java"; sourceTree = "<group>"; };
291-
CE85B3191F3655DD0014857D /* JavaMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JavaMap.swift; path = java_swift/Sources/JavaMap.swift; sourceTree = SOURCE_ROOT; };
292-
CE85B31A1F3655DD0014857D /* HashMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HashMap.swift; path = java_swift/Sources/HashMap.swift; sourceTree = SOURCE_ROOT; };
293-
CE85B31B1F3655DD0014857D /* JavaSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JavaSet.swift; path = java_swift/Sources/JavaSet.swift; sourceTree = SOURCE_ROOT; };
294285
/* End PBXFileReference section */
295286

296287
/* Begin PBXFrameworksBuildPhase section */
@@ -346,8 +337,9 @@
346337
BBF280D81D64BC6100A7AF5D /* src */,
347338
CE4A250F1F3555CA003AF384 /* com_johnholdsworth */,
348339
BB6651351F2E3F50004EFD5F /* android_toolchain */,
349-
BB6651301F2E39F6004EFD5F /* swift-android-kotlin */,
340+
BB643B311F4873F7003E849E /* swift-android-gradle */,
350341
BB9CF8971D61BAF4004781B9 /* swift-android-samples */,
342+
BB6651301F2E39F6004EFD5F /* swift-android-kotlin */,
351343
BB5ACFDC1D35B09900E2386A /* Products */,
352344
BBCD66EC1D36A03F00DF5E47 /* Frameworks */,
353345
);
@@ -448,17 +440,6 @@
448440
BBC13DC11D4900AA0035A039 /* SwiftTest.swift */,
449441
BBC13DB81D48FDCE0035A039 /* org_swiftjava.swift */,
450442
BBC13DC51D490B160035A039 /* test_body.swift */,
451-
CE4A24FD1F34B37C003AF384 /* JNICore.swift */,
452-
CE4A24FF1F34B37C003AF384 /* JNIObject.swift */,
453-
CE4A25021F34B37C003AF384 /* JNIField.swift */,
454-
CE4A24FB1F34B37C003AF384 /* JNIMethod.swift */,
455-
CE4A24FC1F34B37C003AF384 /* JNIType.swift */,
456-
CE4A24FE1F34B37C003AF384 /* JavaClass.swift */,
457-
CE4A25011F34B37C003AF384 /* JavaObject.swift */,
458-
CE85B31A1F3655DD0014857D /* HashMap.swift */,
459-
CE85B31B1F3655DD0014857D /* JavaSet.swift */,
460-
CE85B3191F3655DD0014857D /* JavaMap.swift */,
461-
CE4A25001F34B37C003AF384 /* Runnable.swift */,
462443
BBC13DBA1D48FDCE0035A039 /* Info.plist */,
463444
);
464445
path = org_swiftjava;
@@ -769,6 +750,7 @@
769750
BB6651361F2E3F51004EFD5F /* android_toolchain in Resources */,
770751
BB31E20F1D4FF13400779860 /* genpkg.sh in Resources */,
771752
BBF280D91D64BC6100A7AF5D /* src in Resources */,
753+
BB643B321F4873F7003E849E /* swift-android-gradle in Resources */,
772754
BB9CF8981D61BAF4004781B9 /* swift-android-samples in Resources */,
773755
BB5ACFE41D35B09900E2386A /* MainMenu.xib in Resources */,
774756
CE81023A1F3693510069563B /* MainActivity.kt in Resources */,

‎SwiftJava.xcodeproj/project.xcworkspace/xcshareddata/SwiftJava.xcscmblueprint

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
"A4A5B9FFE9560298D43F77C6A13830755B45E233" : 0,
2020
"685A538D4847A574735DC1EA392743F80472F6DF" : 0
2121
},
22-
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6E889BEB-D486-40E6-9542-259D7175A4E2",
22+
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6BFDE20B-CFCB-4CEC-B3D1-A0DEAE5DDDC0",
2323
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
24-
"919E7FD20BEE11F783ACA7E8733E036FFD3CC2A7" : "SwiftJava\/swift-android-kotlin\/app\/src\/main\/swift\/.build\/checkouts\/java_swift.git-9082904271628832338\/",
24+
"919E7FD20BEE11F783ACA7E8733E036FFD3CC2A7" : "SwiftJava\/java_swift\/",
2525
"975F9120751D6C438E9A5C85C38DE132AC6185DA" : "SwiftJava\/java_sql\/",
2626
"34073D21618405EACC233186A25025AB1438DB71" : "SwiftJava\/javax_swing\/",
2727
"D69ED636B0A47DAAE52D01130A54526F3F08576F" : "SwiftJava\/swift-android-samples\/",
2828
"2448595CDB5ED36D9EAF6DDDED0F943FA508C747" : "SwiftJava\/android_toolchain\/",
29-
"F35EB971E2A3FAC98274059126C5879BB91B08C3" : "SwiftJava\/swift-android-samples\/swifthello\/src\/main\/swift\/.build\/checkouts\/java_lang.git-938659873749723846\/",
29+
"F35EB971E2A3FAC98274059126C5879BB91B08C3" : "SwiftJava\/java_lang\/",
3030
"88C7909D14364BE1B34BD9FA7515C938F2799EDA" : "SwiftJava\/com_apple\/",
3131
"F5602BE39D3BC51A40E8B26B29F3243856A652CB" : "SwiftJava\/java_awt\/",
3232
"878C2603E03822D160043D9D16A36206CED4E0CA" : "SwiftJava\/",
3333
"89DEE779F8BFE1CE8DDEF7AB113FB6B93E7D55C6" : "SwiftJava\/examples\/",
34-
"03D674EFBA86A077C658C74B9BF7405C80AD6E58" : "SwiftJava\/swift-android-kotlin\/app\/src\/main\/swift\/.build\/checkouts\/CJavaVM.git--1521134582023321205\/",
34+
"03D674EFBA86A077C658C74B9BF7405C80AD6E58" : "SwiftJava\/CJavaVM\/",
3535
"7FD9F53F3E97DB446A68FCFF0B1331098D829EA6" : "SwiftJava\/swift-android-gradle\/",
3636
"A4A5B9FFE9560298D43F77C6A13830755B45E233" : "SwiftJava\/swift-android-kotlin\/",
3737
"685A538D4847A574735DC1EA392743F80472F6DF" : "SwiftJava\/java_util\/"
@@ -66,7 +66,7 @@
6666
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7FD9F53F3E97DB446A68FCFF0B1331098D829EA6"
6767
},
6868
{
69-
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "http:\/\/github.com\/SwiftJava\/SwiftJava.git",
69+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "http:\/\/github.com\/SwiftJava\/SwiftJava",
7070
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
7171
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "878C2603E03822D160043D9D16A36206CED4E0CA"
7272
},

‎android_toolchain

‎com_apple

Submodulecom_apple updated164 files

‎com_johnholdsworth/Sources/SwiftHelloBinding.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ open class SwiftHelloBindingForward: JNIObjectForward, SwiftHelloBinding {
1616

1717
}
1818

19-

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp