Skip to content

Commit ab6f48e

Browse files
ktosoktoso
committed
Furhter mass renames -> SwiftJava-everything
1 parent 9225edf commit ab6f48e

File tree

239 files changed

+230
-223
lines changed

Some content is hidden

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

239 files changed

+230
-223
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import Benchmark
1616
import Foundation
17-
import SwiftJNI
17+
import SwiftJava
1818
import JavaNet
1919

2020
@MainActor let benchmarks = {

‎Benchmarks/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ let package = Package(
5252
name: "JavaApiCallBenchmarks",
5353
dependencies: [
5454
.product(name: "CJNI", package: "swift-java"),
55-
.product(name: "SwiftJNI", package: "swift-java"),
55+
.product(name: "SwiftJava", package: "swift-java"),
5656
.product(name: "JavaNet", package: "swift-java"),
5757
.product(name: "Benchmark", package: "package-benchmark"),
5858
],

‎Package.swift‎

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

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

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

237237
.target(
238-
name: "SwiftJNI",
238+
name: "SwiftJava",
239239
dependencies: [
240240
"CJNI",
241-
"SwiftJNIMacros",
241+
"SwiftJavaMacros",
242242
"JavaTypes",
243243
"SwiftJavaConfigurationShared", // for Configuration reading at runtime
244244
],
@@ -269,7 +269,7 @@ let package = Package(
269269
),
270270
.target(
271271
name: "JavaUtil",
272-
dependencies: ["SwiftJNI"],
272+
dependencies: ["SwiftJava"],
273273
path: "Sources/JavaStdlib/JavaUtil",
274274
exclude: ["swift-java.config"],
275275
swiftSettings: [
@@ -279,7 +279,7 @@ let package = Package(
279279
),
280280
.target(
281281
name: "JavaUtilFunction",
282-
dependencies: ["SwiftJNI"],
282+
dependencies: ["SwiftJava"],
283283
path: "Sources/JavaStdlib/JavaUtilFunction",
284284
exclude: ["swift-java.config"],
285285
swiftSettings: [
@@ -289,7 +289,7 @@ let package = Package(
289289
),
290290
.target(
291291
name: "JavaUtilJar",
292-
dependencies: ["SwiftJNI", "JavaUtil"],
292+
dependencies: ["SwiftJava", "JavaUtil"],
293293
path: "Sources/JavaStdlib/JavaUtilJar",
294294
exclude: ["swift-java.config"],
295295
swiftSettings: [
@@ -299,7 +299,7 @@ let package = Package(
299299
),
300300
.target(
301301
name: "JavaNet",
302-
dependencies: ["SwiftJNI", "JavaUtil"],
302+
dependencies: ["SwiftJava", "JavaUtil"],
303303
path: "Sources/JavaStdlib/JavaNet",
304304
exclude: ["swift-java.config"],
305305
swiftSettings: [
@@ -309,7 +309,7 @@ let package = Package(
309309
),
310310
.target(
311311
name: "JavaIO",
312-
dependencies: ["SwiftJNI", "JavaUtil"],
312+
dependencies: ["SwiftJava", "JavaUtil"],
313313
path: "Sources/JavaStdlib/JavaIO",
314314
exclude: ["swift-java.config"],
315315
swiftSettings: [
@@ -319,7 +319,7 @@ let package = Package(
319319
),
320320
.target(
321321
name: "JavaLangReflect",
322-
dependencies: ["SwiftJNI", "JavaUtil"],
322+
dependencies: ["SwiftJava", "JavaUtil"],
323323
path: "Sources/JavaStdlib/JavaLangReflect",
324324
exclude: ["swift-java.config"],
325325
swiftSettings: [
@@ -375,12 +375,12 @@ let package = Package(
375375
),
376376

377377
.target(
378-
name: "SwiftJavaLib",
378+
name: "SwiftJavaToolLib",
379379
dependencies: [
380380
.product(name: "SwiftBasicFormat", package: "swift-syntax"),
381381
.product(name: "SwiftSyntax", package: "swift-syntax"),
382382
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
383-
"SwiftJNI",
383+
"SwiftJava",
384384
"JavaUtilJar",
385385
"JavaLangReflect",
386386
"JavaNet",
@@ -405,10 +405,10 @@ let package = Package(
405405
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
406406
.product(name: "ArgumentParser", package: "swift-argument-parser"),
407407
.product(name: "SystemPackage", package: "swift-system"),
408-
"SwiftJNI",
408+
"SwiftJava",
409409
"JavaUtilJar",
410410
"JavaNet",
411-
"SwiftJavaLib",
411+
"SwiftJavaToolLib",
412412
"JExtractSwiftLib",
413413
"SwiftJavaShared",
414414
"SwiftJavaConfigurationShared",
@@ -451,8 +451,11 @@ let package = Package(
451451
),
452452

453453
.testTarget(
454-
name: "SwiftJNITests",
455-
dependencies: ["SwiftJNI", "JavaNet"],
454+
name: "SwiftJavaTests",
455+
dependencies: [
456+
"SwiftJava",
457+
"JavaNet"
458+
],
456459
swiftSettings: [
457460
.swiftLanguageMode(.v5),
458461
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -461,16 +464,18 @@ let package = Package(
461464

462465
.testTarget(
463466
name: "JavaTypesTests",
464-
dependencies: ["JavaTypes"],
467+
dependencies: [
468+
"JavaTypes"
469+
],
465470
swiftSettings: [
466471
.swiftLanguageMode(.v5)
467472
]
468473
),
469474

470475
.testTarget(
471-
name: "SwiftJNIMacroTests",
476+
name: "SwiftJavaMacrosTests",
472477
dependencies: [
473-
"SwiftJNIMacros",
478+
"SwiftJavaMacros",
474479
.product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
475480
],
476481
swiftSettings: [
@@ -479,8 +484,10 @@ let package = Package(
479484
),
480485

481486
.testTarget(
482-
name: "SwiftJavaTests",
483-
dependencies: ["SwiftJavaLib"],
487+
name: "SwiftJavaToolLibTests",
488+
dependencies: [
489+
"SwiftJavaToolLib"
490+
],
484491
swiftSettings: [
485492
.swiftLanguageMode(.v5),
486493
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

‎Samples/JavaDependencySampleApp/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let package = Package(
6464
.executableTarget(
6565
name: "JavaDependencySample",
6666
dependencies: [
67-
.product(name: "SwiftJNI", package: "swift-java"),
67+
.product(name: "SwiftJava", package: "swift-java"),
6868
.product(name: "CJNI", package: "swift-java"),
6969
.product(name: "JavaUtilFunction", package: "swift-java"),
7070
"JavaCommonsCSV"
@@ -82,7 +82,7 @@ let package = Package(
8282
.target(
8383
name: "JavaCommonsCSV",
8484
dependencies: [
85-
.product(name: "SwiftJNI", package: "swift-java"),
85+
.product(name: "SwiftJava", package: "swift-java"),
8686
.product(name: "JavaUtilFunction", package: "swift-java"),
8787
.product(name: "JavaUtil", package: "swift-java"),
8888
.product(name: "JavaIO", package: "swift-java"),

‎Samples/JavaDependencySampleApp/Sources/JavaDependencySample/main.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import SwiftJNI
15+
import SwiftJava
1616
import JavaUtilFunction
1717
import JavaIO
1818
import SwiftJavaConfigurationShared

‎Samples/JavaKitSampleApp/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ let package = Package(
6565
.target(
6666
name: "JavaKitExample",
6767
dependencies: [
68-
.product(name: "SwiftJNI", package: "swift-java"),
68+
.product(name: "SwiftJava", package: "swift-java"),
6969
.product(name: "JavaUtilFunction", package: "swift-java"),
7070
.product(name: "JavaUtilJar", package: "swift-java"),
7171
],

‎Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import SwiftJNI
15+
import SwiftJava
1616
import JavaUtilFunction
1717

1818
enum SwiftWrappedError: Error {

‎Samples/JavaProbablyPrime/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ let package = Package(
3030
name: "JavaProbablyPrime",
3131
dependencies: [
3232
.product(name: "JavaUtil", package: "swift-java"),
33-
.product(name: "SwiftJNI", package: "swift-java"),
33+
.product(name: "SwiftJava", package: "swift-java"),
3434
.product(name: "ArgumentParser", package: "swift-argument-parser"),
3535
],
3636
swiftSettings: [

‎Samples/JavaProbablyPrime/Sources/JavaProbablyPrime/prime.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import ArgumentParser
16-
import SwiftJNI
16+
import SwiftJava
1717

1818
@main
1919
struct ProbablyPrime: ParsableCommand {

0 commit comments

Comments
 (0)