Skip to content

Commit caa97a4

Browse files
ktosoktoso
authored
Reorganize and rename modules; Centralize around SwiftJava prefix and naming (swiftlang#366)
1 parent 1d20148 commit caa97a4

File tree

296 files changed

+641
-527
lines changed

Some content is hidden

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

296 files changed

+641
-527
lines changed

‎.github/workflows/pull_request.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ jobs:
166166
'JavaProbablyPrime',
167167
'JavaSieve',
168168
'SwiftAndJavaJarSampleLib',
169-
'SwiftKitSampleApp',
170-
'JExtractJNISampleApp',
169+
'SwiftJavaExtractFFMSampleApp',
170+
'SwiftJavaExtractJNISampleApp',
171171
]
172172
container:
173173
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
@@ -194,8 +194,8 @@ jobs:
194194
'JavaProbablyPrime',
195195
'JavaSieve',
196196
'SwiftAndJavaJarSampleLib',
197-
'SwiftKitSampleApp',
198-
'JExtractJNISampleApp',
197+
'SwiftJavaExtractFFMSampleApp',
198+
'SwiftJavaExtractJNISampleApp',
199199
]
200200
steps:
201201
- uses: actions/checkout@v4

‎Benchmarks/Benchmarks/JavaApiCallBenchmarks/JavaApiCallBenchmarks.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import Benchmark
1616
import Foundation
17-
import JavaKit
18-
import JavaKitNetwork
17+
import SwiftJava
18+
import JavaNet
1919

2020
@MainActor let benchmarks = {
2121
var jvm: JavaVirtualMachine {

‎Benchmarks/Package.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ let package = Package(
5151
.executableTarget(
5252
name: "JavaApiCallBenchmarks",
5353
dependencies: [
54-
.product(name: "JavaRuntime", package: "swift-java"),
55-
.product(name: "JavaKit", package: "swift-java"),
56-
.product(name: "JavaKitNetwork", package: "swift-java"),
54+
.product(name: "CJNI", package: "swift-java"),
55+
.product(name: "SwiftJava", package: "swift-java"),
56+
.product(name: "JavaNet", package: "swift-java"),
5757
.product(name: "Benchmark", package: "package-benchmark"),
5858
],
5959
path: "Benchmarks/JavaApiCallBenchmarks",

‎Package.swift‎

Lines changed: 75 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -94,45 +94,45 @@ let package = Package(
9494
.macOS(.v15)
9595
],
9696
products: [
97-
// ==== JavaKit (i.e. calling Java directly Swift utilities)
97+
// ==== SwiftJava (i.e. calling Java directly Swift utilities)
9898
.library(
99-
name: "JavaKit",
100-
targets: ["JavaKit"]
99+
name: "SwiftJava",
100+
targets: ["SwiftJava"]
101101
),
102102

103103
.library(
104-
name: "JavaRuntime",
105-
targets: ["JavaRuntime"]
104+
name: "CJNI",
105+
targets: ["CJNI"]
106106
),
107107

108108
.library(
109-
name: "JavaKitCollection",
110-
targets: ["JavaKitCollection"]
109+
name: "JavaUtil",
110+
targets: ["JavaUtil"]
111111
),
112112

113113
.library(
114-
name: "JavaKitFunction",
115-
targets: ["JavaKitFunction"]
114+
name: "JavaUtilFunction",
115+
targets: ["JavaUtilFunction"]
116116
),
117117

118118
.library(
119-
name: "JavaKitJar",
120-
targets: ["JavaKitJar"]
119+
name: "JavaUtilJar",
120+
targets: ["JavaUtilJar"]
121121
),
122122

123123
.library(
124-
name: "JavaKitNetwork",
125-
targets: ["JavaKitNetwork"]
124+
name: "JavaNet",
125+
targets: ["JavaNet"]
126126
),
127127

128128
.library(
129-
name: "JavaKitIO",
130-
targets: ["JavaKitIO"]
129+
name: "JavaIO",
130+
targets: ["JavaIO"]
131131
),
132132

133133
.library(
134-
name: "JavaKitReflection",
135-
targets: ["JavaKitReflection"]
134+
name: "JavaLangReflect",
135+
targets: ["JavaLangReflect"]
136136
),
137137

138138
.library(
@@ -212,13 +212,13 @@ let package = Package(
212212
.target(
213213
name: "SwiftJavaDocumentation",
214214
dependencies: [
215-
"JavaKit",
215+
"SwiftJava",
216216
"SwiftKitSwift",
217217
]
218218
),
219219

220220
.macro(
221-
name: "JavaKitMacros",
221+
name: "SwiftJavaMacros",
222222
dependencies: [
223223
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
224224
.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
@@ -235,12 +235,12 @@ let package = Package(
235235
),
236236

237237
.target(
238-
name: "JavaKit",
238+
name: "SwiftJava",
239239
dependencies: [
240-
"JavaRuntime",
241-
"JavaKitMacros",
240+
"CJNI",
241+
"SwiftJavaMacros",
242242
"JavaTypes",
243-
"JavaKitConfigurationShared", // for Configuration reading at runtime
243+
"SwiftJavaConfigurationShared", // for Configuration reading at runtime
244244
],
245245
exclude: ["swift-java.config"],
246246
swiftSettings: [
@@ -268,53 +268,59 @@ let package = Package(
268268
]
269269
),
270270
.target(
271-
name: "JavaKitCollection",
272-
dependencies: ["JavaKit"],
271+
name: "JavaUtil",
272+
dependencies: ["SwiftJava"],
273+
path: "Sources/JavaStdlib/JavaUtil",
273274
exclude: ["swift-java.config"],
274275
swiftSettings: [
275276
.swiftLanguageMode(.v5),
276277
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
277278
]
278279
),
279280
.target(
280-
name: "JavaKitFunction",
281-
dependencies: ["JavaKit"],
281+
name: "JavaUtilFunction",
282+
dependencies: ["SwiftJava"],
283+
path: "Sources/JavaStdlib/JavaUtilFunction",
282284
exclude: ["swift-java.config"],
283285
swiftSettings: [
284286
.swiftLanguageMode(.v5),
285287
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
286288
]
287289
),
288290
.target(
289-
name: "JavaKitJar",
290-
dependencies: ["JavaKit", "JavaKitCollection"],
291+
name: "JavaUtilJar",
292+
dependencies: ["SwiftJava", "JavaUtil"],
293+
path: "Sources/JavaStdlib/JavaUtilJar",
291294
exclude: ["swift-java.config"],
292295
swiftSettings: [
293296
.swiftLanguageMode(.v5),
294297
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
295298
]
296299
),
297300
.target(
298-
name: "JavaKitNetwork",
299-
dependencies: ["JavaKit", "JavaKitCollection"],
301+
name: "JavaNet",
302+
dependencies: ["SwiftJava", "JavaUtil"],
303+
path: "Sources/JavaStdlib/JavaNet",
300304
exclude: ["swift-java.config"],
301305
swiftSettings: [
302306
.swiftLanguageMode(.v5),
303307
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
304308
]
305309
),
306310
.target(
307-
name: "JavaKitIO",
308-
dependencies: ["JavaKit", "JavaKitCollection"],
311+
name: "JavaIO",
312+
dependencies: ["SwiftJava", "JavaUtil"],
313+
path: "Sources/JavaStdlib/JavaIO",
309314
exclude: ["swift-java.config"],
310315
swiftSettings: [
311316
.swiftLanguageMode(.v5),
312317
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
313318
]
314319
),
315320
.target(
316-
name: "JavaKitReflection",
317-
dependencies: ["JavaKit", "JavaKitCollection"],
321+
name: "JavaLangReflect",
322+
dependencies: ["SwiftJava", "JavaUtil"],
323+
path: "Sources/JavaStdlib/JavaLangReflect",
318324
exclude: ["swift-java.config"],
319325
swiftSettings: [
320326
.swiftLanguageMode(.v5),
@@ -353,34 +359,34 @@ let package = Package(
353359
),
354360

355361
.target(
356-
name: "JavaRuntime",
362+
name: "CJNI",
357363
swiftSettings: [
358364
.swiftLanguageMode(.v5),
359365
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
360366
]
361367
),
362368

363369
.target(
364-
name: "JavaKitConfigurationShared"
370+
name: "SwiftJavaConfigurationShared"
365371
),
366372

367373
.target(
368-
name: "JavaKitShared"
374+
name: "SwiftJavaShared"
369375
),
370376

371377
.target(
372-
name: "SwiftJavaLib",
378+
name: "SwiftJavaToolLib",
373379
dependencies: [
374380
.product(name: "SwiftBasicFormat", package: "swift-syntax"),
375381
.product(name: "SwiftSyntax", package: "swift-syntax"),
376382
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
377-
"JavaKit",
378-
"JavaKitJar",
379-
"JavaKitReflection",
380-
"JavaKitNetwork",
383+
"SwiftJava",
384+
"JavaUtilJar",
385+
"JavaLangReflect",
386+
"JavaNet",
381387
"JavaTypes",
382-
"JavaKitShared",
383-
"JavaKitConfigurationShared",
388+
"SwiftJavaShared",
389+
"SwiftJavaConfigurationShared",
384390
// .product(name: "Subprocess", package: "swift-subprocess")
385391
"_Subprocess",
386392
],
@@ -399,13 +405,13 @@ let package = Package(
399405
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
400406
.product(name: "ArgumentParser", package: "swift-argument-parser"),
401407
.product(name: "SystemPackage", package: "swift-system"),
402-
"JavaKit",
403-
"JavaKitJar",
404-
"JavaKitNetwork",
405-
"SwiftJavaLib",
408+
"SwiftJava",
409+
"JavaUtilJar",
410+
"JavaNet",
411+
"SwiftJavaToolLib",
406412
"JExtractSwiftLib",
407-
"JavaKitShared",
408-
"JavaKitConfigurationShared",
413+
"SwiftJavaShared",
414+
"SwiftJavaConfigurationShared",
409415
],
410416
swiftSettings: [
411417
.swiftLanguageMode(.v5),
@@ -427,8 +433,8 @@ let package = Package(
427433
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
428434
.product(name: "ArgumentParser", package: "swift-argument-parser"),
429435
"JavaTypes",
430-
"JavaKitShared",
431-
"JavaKitConfigurationShared",
436+
"SwiftJavaShared",
437+
"SwiftJavaConfigurationShared",
432438
],
433439
swiftSettings: [
434440
.swiftLanguageMode(.v5),
@@ -445,8 +451,11 @@ let package = Package(
445451
),
446452

447453
.testTarget(
448-
name: "JavaKitTests",
449-
dependencies: ["JavaKit", "JavaKitNetwork"],
454+
name: "SwiftJavaTests",
455+
dependencies: [
456+
"SwiftJava",
457+
"JavaNet"
458+
],
450459
swiftSettings: [
451460
.swiftLanguageMode(.v5),
452461
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -455,16 +464,18 @@ let package = Package(
455464

456465
.testTarget(
457466
name: "JavaTypesTests",
458-
dependencies: ["JavaTypes"],
467+
dependencies: [
468+
"JavaTypes"
469+
],
459470
swiftSettings: [
460471
.swiftLanguageMode(.v5)
461472
]
462473
),
463474

464475
.testTarget(
465-
name: "JavaKitMacroTests",
476+
name: "SwiftJavaMacrosTests",
466477
dependencies: [
467-
"JavaKitMacros",
478+
"SwiftJavaMacros",
468479
.product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
469480
],
470481
swiftSettings: [
@@ -473,17 +484,19 @@ let package = Package(
473484
),
474485

475486
.testTarget(
476-
name: "SwiftJavaTests",
477-
dependencies: ["SwiftJavaLib"],
487+
name: "SwiftJavaToolLibTests",
488+
dependencies: [
489+
"SwiftJavaToolLib"
490+
],
478491
swiftSettings: [
479492
.swiftLanguageMode(.v5),
480493
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
481494
]
482495
),
483496

484497
.testTarget(
485-
name: "JavaKitConfigurationSharedTests",
486-
dependencies: ["JavaKitConfigurationShared"],
498+
name: "SwiftJavaConfigurationSharedTests",
499+
dependencies: ["SwiftJavaConfigurationShared"],
487500
swiftSettings: [
488501
.swiftLanguageMode(.v5),
489502
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

‎Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
4343

4444
let sourceDir = target.directory.string
4545

46-
// The name of the configuration file JavaKit.config from the target for
46+
// The name of the configuration file SwiftJava.config from the target for
4747
// which we are generating Swift wrappers for Java classes.
4848
let configFile = URL(filePath: sourceDir).appending(path: "swift-java.config")
4949
let configuration = try readConfiguration(sourceDir: "\(sourceDir)")

‎Plugins/JavaCompilerPlugin/JavaCompilerPlugin.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct JavaCompilerBuildToolPlugin: BuildToolPlugin {
3232
// so we cannot eliminate this deprecation warning.
3333
let sourceDir = target.directory.string
3434

35-
// The name of the configuration file JavaKit.config from the target for
35+
// The name of the configuration file SwiftJava.config from the target for
3636
// which we are generating Swift wrappers for Java classes.
3737
let configFile = URL(filePath: sourceDir).appending(path: "swift-java.config")
3838
let config: Configuration?

‎Plugins/PluginsShared/JavaKitConfigurationShared‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Plugins/PluginsShared/SwiftJavaConfigurationShared‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../Sources/SwiftJavaConfigurationShared

‎Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
3434
// so we cannot eliminate this deprecation warning.
3535
let sourceDir = target.directory.string
3636

37-
// The name of the configuration file JavaKit.config from the target for
37+
// The name of the configuration file SwiftJava.config from the target for
3838
// which we are generating Swift wrappers for Java classes.
3939
let configFile = URL(filePath: sourceDir)
4040
.appending(path: SwiftJavaConfigFileName)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ To view the rendered docc documentation you can use the docc preview command:
184184
xcrun docc preview Sources/SwiftJavaDocumentation/Documentation.docc
185185
186186
# OR JavaKit to view JavaKit documentation:
187-
# xcrun docc preview Sources/JavaKit/Documentation.docc
187+
# xcrun docc preview Sources/SwiftJNI/Documentation.docc
188188
189189
# ========================================
190190
# Starting Local Preview Server

0 commit comments

Comments
 (0)