Skip to content

Commit e03a0bc

Browse files
committed
Rename: JavaRuntime -> CJNI to follow usual C target naming convention
1 parent 8361d8a commit e03a0bc

File tree

177 files changed

+252
-210
lines changed

Some content is hidden

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

177 files changed

+252
-210
lines changed

Benchmarks/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ let package = Package(
5151
.executableTarget(
5252
name: "JavaApiCallBenchmarks",
5353
dependencies: [
54-
.product(name: "JavaRuntime", package: "swift-java"),
54+
.product(name: "CJNI", package: "swift-java"),
5555
.product(name: "SwiftJNI", package: "swift-java"),
5656
.product(name: "JavaNet", package: "swift-java"),
5757
.product(name: "Benchmark", package: "package-benchmark"),

Package.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ let package = Package(
101101
),
102102

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

108108
.library(
@@ -237,7 +237,7 @@ let package = Package(
237237
.target(
238238
name: "SwiftJNI",
239239
dependencies: [
240-
"JavaRuntime",
240+
"CJNI",
241241
"SwiftJNIMacros",
242242
"JavaTypes",
243243
"SwiftJavaConfigurationShared", // for Configuration reading at runtime
@@ -359,7 +359,7 @@ let package = Package(
359359
),
360360

361361
.target(
362-
name: "JavaRuntime",
362+
name: "CJNI",
363363
swiftSettings: [
364364
.swiftLanguageMode(.v5),
365365
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
@@ -371,7 +371,7 @@ let package = Package(
371371
),
372372

373373
.target(
374-
name: "JavaKitShared"
374+
name: "SwiftJavaShared"
375375
),
376376

377377
.target(
@@ -385,7 +385,7 @@ let package = Package(
385385
"JavaLangReflect",
386386
"JavaNet",
387387
"JavaTypes",
388-
"JavaKitShared",
388+
"SwiftJavaShared",
389389
"SwiftJavaConfigurationShared",
390390
// .product(name: "Subprocess", package: "swift-subprocess")
391391
"_Subprocess",
@@ -410,7 +410,7 @@ let package = Package(
410410
"JavaNet",
411411
"SwiftJavaLib",
412412
"JExtractSwiftLib",
413-
"JavaKitShared",
413+
"SwiftJavaShared",
414414
"SwiftJavaConfigurationShared",
415415
],
416416
swiftSettings: [
@@ -433,7 +433,7 @@ let package = Package(
433433
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
434434
.product(name: "ArgumentParser", package: "swift-argument-parser"),
435435
"JavaTypes",
436-
"JavaKitShared",
436+
"SwiftJavaShared",
437437
"SwiftJavaConfigurationShared",
438438
],
439439
swiftSettings: [
@@ -451,7 +451,7 @@ let package = Package(
451451
),
452452

453453
.testTarget(
454-
name: "JavaKitTests",
454+
name: "SwiftJNITests",
455455
dependencies: ["SwiftJNI", "JavaNet"],
456456
swiftSettings: [
457457
.swiftLanguageMode(.v5),
@@ -468,7 +468,7 @@ let package = Package(
468468
),
469469

470470
.testTarget(
471-
name: "JavaKitMacroTests",
471+
name: "SwiftJNIMacroTests",
472472
dependencies: [
473473
"SwiftJNIMacros",
474474
.product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),

Plugins/PluginsShared/JavaKitConfigurationShared

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

Samples/JExtractJNISampleApp/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ let package = Package(
6161
name: "MySwiftLibrary",
6262
dependencies: [
6363
.product(name: "SwiftJNI", package: "swift-java"),
64-
.product(name: "JavaRuntime", package: "swift-java"),
64+
.product(name: "CJNI", package: "swift-java"),
6565
.product(name: "SwiftKitSwift", package: "swift-java"),
6666
],
6767
exclude: [

Samples/JavaDependencySampleApp/Package.swift

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

Samples/SwiftKitSampleApp/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let package = Package(
6464
name: "MySwiftLibrary",
6565
dependencies: [
6666
.product(name: "SwiftJNI", package: "swift-java"),
67-
.product(name: "JavaRuntime", package: "swift-java"),
67+
.product(name: "CJNI", package: "swift-java"),
6868
.product(name: "SwiftKitSwift", package: "swift-java"),
6969
],
7070
exclude: [

Samples/SwiftKitSampleApp/Sources/MySwiftLibrary/jni/JNIImplementations.swift

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

1515
import SwiftJNI
16-
import JavaRuntime
16+
import CJNI
1717

1818
@JavaClass("com.example.swift.HelloJava2Swift")
1919
open class HelloJava2Swift: JavaObject {
File renamed without changes.

Sources/JavaRuntime/include/JavaRuntime.h renamed to Sources/CJNI/include/CJNI.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
#ifndef Swift_JavaRuntime_h
16-
#define Swift_JavaRuntime_h
15+
#ifndef Swift_CJNI_h
16+
#define Swift_CJNI_h
1717

1818
#include <jni.h>
1919

20-
#endif /* Swift_JavaRuntime_h */
20+
#endif /* Swift_CJNI_h */

0 commit comments

Comments
 (0)