Skip to content

Commit b280177

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

File tree

151 files changed

+157
-157
lines changed

Some content is hidden

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

151 files changed

+157
-157
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: 4 additions & 4 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)"])

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 */
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CJNI {
2+
umbrella header "CJNI.h"
3+
export *
4+
}

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ extension JNISwift2JavaGenerator {
276276
// Generated by swift-java
277277
278278
import SwiftJNI
279-
import JavaRuntime
279+
import CJNI
280280
281281
"""
282282
)

0 commit comments

Comments
 (0)