Skip to content

Package cleanup #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Package cleanup #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4508462
Re-export JavaRuntime from the JavaKit module
DougGregor Oct 7, 2024
39d76f8
Only build the JavaKitExample shared library itself as a dynamic library
DougGregor Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,21 @@ let package = Package(
products: [
.library(
name: "JavaKit",
type: .dynamic,
targets: ["JavaKit"]
),

.library(
name: "JavaKitJar",
type: .dynamic,
targets: ["JavaKitReflection"]
),

.library(
name: "JavaKitNetwork",
type: .dynamic,
targets: ["JavaKitReflection"]
),

.library(
name: "JavaKitReflection",
type: .dynamic,
targets: ["JavaKitReflection"]
),

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

.library(
name: "JavaKitVM",
type: .dynamic,
targets: ["JavaKitVM"]
),

.library(
name: "JavaTypes",
type: .dynamic,
targets: ["JavaTypes"]
),

.library(
name: "JExtractSwift",
type: .dynamic,
targets: ["JExtractSwift"]
),

Expand Down
1 change: 0 additions & 1 deletion Sources/Java2Swift/JavaToSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import JavaKitJar
import JavaKitNetwork
import JavaKitReflection
import JavaKitVM
import JavaRuntime
import SwiftSyntax
import SwiftSyntaxBuilder

Expand Down
1 change: 0 additions & 1 deletion Sources/JavaKit/BridgedValues/JavaValue+Array.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
//
//===----------------------------------------------------------------------===//

import JavaRuntime
import JavaTypes

extension Array: JavaValue where Element: JavaValue {
Expand Down
1 change: 0 additions & 1 deletion Sources/JavaKit/BridgedValues/JavaValue+Bool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
//
//===----------------------------------------------------------------------===//

import JavaRuntime
import JavaTypes

extension Bool: JavaValue {
Expand Down
1 change: 0 additions & 1 deletion Sources/JavaKit/BridgedValues/JavaValue+FloatingPoint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
//
//===----------------------------------------------------------------------===//

import JavaRuntime
import JavaTypes

extension Float: JavaValue {
Expand Down
1 change: 0 additions & 1 deletion Sources/JavaKit/BridgedValues/JavaValue+Integers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
//
//===----------------------------------------------------------------------===//

import JavaRuntime
import JavaTypes

extension Int8: JavaValue {
Expand Down
1 change: 0 additions & 1 deletion Sources/JavaKit/BridgedValues/JavaValue+String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
//
//===----------------------------------------------------------------------===//

import JavaRuntime
import JavaTypes

extension String: JavaValue {
Expand Down
15 changes: 15 additions & 0 deletions Sources/JavaKit/JavaRuntime+Reexport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//===----------------------------------------------------------------------===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
// Licensed under Apache License v2.0
//
// See LICENSE.txt for license information
// See CONTRIBUTORS.txt for the list of Swift.org project authors
//
// SPDX-License-Identifier: Apache-2.0
//
//===----------------------------------------------------------------------===//

@_exported import JavaRuntime
1 change: 0 additions & 1 deletion Sources/JavaKitVM/JavaVirtualMachine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
//===----------------------------------------------------------------------===//

import JavaKit
import JavaRuntime

typealias JavaVMPointer = UnsafeMutablePointer<JavaVM?>

Expand Down
1 change: 0 additions & 1 deletion Tests/JavaKitTests/BasicRuntimeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import JavaKit
import JavaKitNetwork
import JavaKitVM
import JavaRuntime
import Testing

@MainActor
Expand Down
2 changes: 0 additions & 2 deletions USER_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ Now, in the `HelloSwift` Swift library, define a `struct` that provides the `mai

```swift
import JavaKit
import JavaRuntime

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

@JavaClass("org.swift.javakit.HelloSwiftMain")
struct HelloSwiftMain: ParsableCommand {
Expand Down
Loading