Skip to content

Commit 8631e5d

Browse files
authored
Merge pull request #48 from DougGregor/package-cleanup
Package cleanup
2 parents 31b5cac + 39d76f8 commit 8631e5d

File tree

11 files changed

+15
-17
lines changed

11 files changed

+15
-17
lines changed

Package.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,21 @@ let package = Package(
5252
products: [
5353
.library(
5454
name: "JavaKit",
55-
type: .dynamic,
5655
targets: ["JavaKit"]
5756
),
5857

5958
.library(
6059
name: "JavaKitJar",
61-
type: .dynamic,
6260
targets: ["JavaKitReflection"]
6361
),
6462

6563
.library(
6664
name: "JavaKitNetwork",
67-
type: .dynamic,
6865
targets: ["JavaKitReflection"]
6966
),
7067

7168
.library(
7269
name: "JavaKitReflection",
73-
type: .dynamic,
7470
targets: ["JavaKitReflection"]
7571
),
7672

@@ -82,19 +78,16 @@ let package = Package(
8278

8379
.library(
8480
name: "JavaKitVM",
85-
type: .dynamic,
8681
targets: ["JavaKitVM"]
8782
),
8883

8984
.library(
9085
name: "JavaTypes",
91-
type: .dynamic,
9286
targets: ["JavaTypes"]
9387
),
9488

9589
.library(
9690
name: "JExtractSwift",
97-
type: .dynamic,
9891
targets: ["JExtractSwift"]
9992
),
10093

Sources/Java2Swift/JavaToSwift.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import JavaKitJar
1919
import JavaKitNetwork
2020
import JavaKitReflection
2121
import JavaKitVM
22-
import JavaRuntime
2322
import SwiftSyntax
2423
import SwiftSyntaxBuilder
2524

Sources/JavaKit/BridgedValues/JavaValue+Array.swift

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

15-
import JavaRuntime
1615
import JavaTypes
1716

1817
extension Array: JavaValue where Element: JavaValue {

Sources/JavaKit/BridgedValues/JavaValue+Bool.swift

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

15-
import JavaRuntime
1615
import JavaTypes
1716

1817
extension Bool: JavaValue {

Sources/JavaKit/BridgedValues/JavaValue+FloatingPoint.swift

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

15-
import JavaRuntime
1615
import JavaTypes
1716

1817
extension Float: JavaValue {

Sources/JavaKit/BridgedValues/JavaValue+Integers.swift

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

15-
import JavaRuntime
1615
import JavaTypes
1716

1817
extension Int8: JavaValue {

Sources/JavaKit/BridgedValues/JavaValue+String.swift

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

15-
import JavaRuntime
1615
import JavaTypes
1716

1817
extension String: JavaValue {
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// This source file is part of the Swift.org open source project
4+
//
5+
// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
6+
// Licensed under Apache License v2.0
7+
//
8+
// See LICENSE.txt for license information
9+
// See CONTRIBUTORS.txt for the list of Swift.org project authors
10+
//
11+
// SPDX-License-Identifier: Apache-2.0
12+
//
13+
//===----------------------------------------------------------------------===//
14+
15+
@_exported import JavaRuntime

Sources/JavaKitVM/JavaVirtualMachine.swift

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

1515
import JavaKit
16-
import JavaRuntime
1716

1817
typealias JavaVMPointer = UnsafeMutablePointer<JavaVM?>
1918

Tests/JavaKitTests/BasicRuntimeTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import JavaKit
1616
import JavaKitNetwork
1717
import JavaKitVM
18-
import JavaRuntime
1918
import Testing
2019

2120
@MainActor

USER_GUIDE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Now, in the `HelloSwift` Swift library, define a `struct` that provides the `mai
5757

5858
```swift
5959
import JavaKit
60-
import JavaRuntime
6160

6261
@JavaClass("org.swift.javakit.HelloSwiftMain")
6362
struct HelloSwiftMain {
@@ -87,7 +86,6 @@ The easiest way to build a command-line program in Swift is with the [Swift argu
8786
```swift
8887
import ArgumentParser
8988
import JavaKit
90-
import JavaRuntime
9189

9290
@JavaClass("org.swift.javakit.HelloSwiftMain")
9391
struct HelloSwiftMain: ParsableCommand {

0 commit comments

Comments
 (0)