Skip to content

Commit ab4c563

Browse files
authored
Merge pull request #45 from ktoso/wip-require-swift-6
2 parents 8bbe21b + 82f20e7 commit ab4c563

File tree

2 files changed

+38
-5
lines changed

2 files changed

+38
-5
lines changed

JavaSwiftKitDemo/src/test/java/org/example/swift/SwiftKitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static void beforeAll() {
4242

4343
@Test
4444
void call_retain_retainCount_release() {
45-
var obj = MySwiftClass.init(1, 2);
45+
var obj = new MySwiftClass(1, 2);
4646

4747
assertEquals(1, SwiftKit.retainCount(obj.$memorySegment()));
4848
// TODO: test directly on SwiftHeapObject inheriting obj

Package.swift

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.9
1+
// swift-tools-version: 6.0
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import CompilerPluginSupport
@@ -119,16 +119,23 @@ let package = Package(
119119
dependencies: [
120120
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
121121
.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
122+
],
123+
swiftSettings: [
124+
.swiftLanguageMode(.v5)
122125
]
123126
),
124127
.target(
125-
name: "JavaTypes"
128+
name: "JavaTypes",
129+
swiftSettings: [
130+
.swiftLanguageMode(.v5)
131+
]
126132
),
127133
.target(
128134
name: "JavaKit",
129135
dependencies: ["JavaRuntime", "JavaKitMacros", "JavaTypes"],
130136
exclude: ["generated/JavaKit.swift2java"],
131137
swiftSettings: [
138+
.swiftLanguageMode(.v5),
132139
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
133140
]
134141
),
@@ -137,6 +144,7 @@ let package = Package(
137144
dependencies: ["JavaKit"],
138145
exclude: ["generated/JavaKitJar.swift2java"],
139146
swiftSettings: [
147+
.swiftLanguageMode(.v5),
140148
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
141149
]
142150
),
@@ -145,6 +153,7 @@ let package = Package(
145153
dependencies: ["JavaKit"],
146154
exclude: ["generated/JavaKitNetwork.swift2java"],
147155
swiftSettings: [
156+
.swiftLanguageMode(.v5),
148157
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
149158
]
150159
),
@@ -153,13 +162,15 @@ let package = Package(
153162
dependencies: ["JavaKit"],
154163
exclude: ["generated/JavaKitReflection.swift2java"],
155164
swiftSettings: [
165+
.swiftLanguageMode(.v5),
156166
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
157167
]
158168
),
159169
.target(
160170
name: "JavaKitVM",
161171
dependencies: ["JavaKit"],
162172
swiftSettings: [
173+
.swiftLanguageMode(.v5),
163174
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
164175
],
165176
linkerSettings: [
@@ -179,13 +190,15 @@ let package = Package(
179190
name: "JavaKitExample",
180191
dependencies: ["JavaKit"],
181192
swiftSettings: [
193+
.swiftLanguageMode(.v5),
182194
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
183195
]
184196
),
185197

186198
.target(
187199
name: "JavaRuntime",
188200
swiftSettings: [
201+
.swiftLanguageMode(.v5),
189202
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
190203
]
191204
),
@@ -205,6 +218,7 @@ let package = Package(
205218
"JavaTypes",
206219
],
207220
swiftSettings: [
221+
.swiftLanguageMode(.v5),
208222
.enableUpcomingFeature("BareSlashRegexLiterals")
209223
]
210224
),
@@ -216,6 +230,9 @@ let package = Package(
216230
dependencies: [
217231
"_SubprocessCShims",
218232
.product(name: "SystemPackage", package: "swift-system"),
233+
],
234+
swiftSettings: [
235+
.swiftLanguageMode(.v5)
219236
]
220237
),
221238
.target(
@@ -225,6 +242,9 @@ let package = Package(
225242
"_CRT_SECURE_NO_WARNINGS",
226243
.when(platforms: [.windows])
227244
)
245+
],
246+
swiftSettings: [
247+
.swiftLanguageMode(.v5)
228248
]
229249
),
230250

@@ -237,24 +257,36 @@ let package = Package(
237257
.product(name: "ArgumentParser", package: "swift-argument-parser"),
238258
"_Subprocess",
239259
"JavaTypes",
260+
],
261+
swiftSettings: [
262+
.swiftLanguageMode(.v5)
240263
]
241264
),
242265

243266
.executableTarget(
244267
name: "JExtractSwiftTool",
245268
dependencies: [
246269
"JExtractSwift",
270+
],
271+
swiftSettings: [
272+
.swiftLanguageMode(.v5)
247273
]
248274
),
249275

250276
.testTarget(
251277
name: "JavaKitTests",
252-
dependencies: ["JavaKit", "JavaKitNetwork", "JavaKitVM"]
278+
dependencies: ["JavaKit", "JavaKitNetwork", "JavaKitVM"],
279+
swiftSettings: [
280+
.swiftLanguageMode(.v5)
281+
]
253282
),
254283

255284
.testTarget(
256285
name: "JavaTypesTests",
257-
dependencies: ["JavaTypes"]
286+
dependencies: ["JavaTypes"],
287+
swiftSettings: [
288+
.swiftLanguageMode(.v5)
289+
]
258290
),
259291

260292
.testTarget(
@@ -263,6 +295,7 @@ let package = Package(
263295
"JExtractSwift"
264296
],
265297
swiftSettings: [
298+
.swiftLanguageMode(.v5),
266299
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
267300
]
268301
),

0 commit comments

Comments
 (0)