Skip to content

Commit da60110

Browse files
committed
CI work
1 parent c856412 commit da60110

File tree

2 files changed

+28
-27
lines changed

2 files changed

+28
-27
lines changed

.github/workflows/ci.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
2323
swift package init
2424
25-
#xcodebuild test -skipPackagePluginValidation -sdk "macosx" -destination "platform=macosx" -scheme SomeLibrary
25+
xcodebuild test -skipPackagePluginValidation -sdk "macosx" -destination "platform=macosx" -scheme SomeLibrary
2626
2727
echo 'package.dependencies += [.package(url: "https://github.com/skiptools/skip", from: "0.0.0")]' >> Package.swift
2828
echo 'package.dependencies += [.package(url: "https://github.com/skiptools/skiphub", from: "0.0.0")]' >> Package.swift
@@ -34,14 +34,15 @@ jobs:
3434
./.build/artifacts/skip/skiptool.artifactbundle/skiptool version
3535
3636
cat Package.swift Package.resolved
37-
37+
3838
#xcodebuild test -skipPackagePluginValidation -sdk "macosx" -destination "platform=macosx" -scheme SomeLibraryKt
39+
3940
xcodebuild test -skipPackagePluginValidation -sdk "macosx" -destination "platform=macosx" -scheme SomeLibrary-Package
4041
4142
# add in an assertion failure to ensure the test now fails
42-
echo 'extension SomeLibraryTests { func testFailure() { XCTAssertEqual(1, 2) } }' >> Tests/SomeLibraryTests/SomeLibraryTests.swift
43+
#echo 'extension SomeLibraryTests { func testFailure() { XCTAssertEqual(1, 2) } }' >> Tests/SomeLibraryTests/SomeLibraryTests.swift
4344
44-
xcodebuild test -skipPackagePluginValidation -sdk "macosx" -destination "platform=macosx" -scheme SomeLibrary-Package && false || true
45+
#xcodebuild test -skipPackagePluginValidation -sdk "macosx" -destination "platform=macosx" -scheme SomeLibrary-Package && false || true
4546
4647
brew install tree || true
4748
tree -l -I build

Package.swift

+23-23
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@ let package = Package(
2323
intent: .custom(verb: "skip-init", description: "Show an introduction to Skip and how it can be added to this project."),
2424
permissions: [
2525
.writeToPackageDirectory(reason: """
26-
Skip: Swift Kotlin Interop”
26+
Skip: Swift Kotlin Interop (Technology Preview)
2727
28-
This plugin will setup the necessary files and folders to transpile your Swift SPM package into a Kotlin Gradle project.
28+
This operation will setup the necessary files and folders to transpile your Swift SPM package into a Kotlin Gradle project.
2929
30-
A “Skip” folder will be created at the root of your package with links to the generated Kotlin sources.
30+
1. A “Skip” folder will be created at the root of your package with a skip.yml configuration file and links to the eventual build output of your project.
3131
32-
• A “TargetNameKt” peer target will be created for each library target in the package, which will use the Skip plugin to transpile the Swift code into Kotlin.
32+
2. The Package.swift file will be modified to add a “TargetNameKt” peer target for each pure-Swift library target, which will use the Skip transpile plugin to generate the Kotlin for its Swift counterpart.
3333
34-
Test cases that inherit `XCTest` will be transpiled to JUnit tests, and the Kotlin test cases can be run from the generated Gradle build files once it is manually installed with the command: `brew install gradle`
34+
3. Test cases that inherit «XCTest» will be transpiled to «JUnit» tests, and the Kotlin test cases can be run from the generated Gradle build files once it is manually installed with the homebrew command: `brew install gradle`
3535
36-
• All Swift dependencies, either local or external, must each have their own Kt peer targets configured. Only Swift source targets are supported: no C, C++, Objective-C or binary targets will be transpiled.
36+
4. A “Skip/README.md” file will be created with the results of this command. Please continue reading this file for further instructions once this command completes.
3737
38-
• A “Skip/README.md” file will be created with the results of this command. Please continue reading this file for further instructions once it has been generated.
38+
You should ensure your project folder is backed up before continuing. By proceeding you agree to abide by the terms and conditions of the Skip license.
3939
4040
“Happy Skipping!
4141
""")
4242
]),
4343
dependencies: ["skiptool"],
4444
path: "Plugins/HelloSkip"),
4545

46-
.plugin(name: "Run Kotlin Tests",
47-
capability: .command(
48-
intent: .custom(verb: "skip-test", description: "Add Kotlin Targets to the current Package.swift"),
49-
permissions: [
50-
.writeToPackageDirectory(reason: "Skip needs to create and update the Skip folder in the project."),
51-
]),
52-
dependencies: ["skiptool"],
53-
path: "Plugins/RunGradleTests"),
46+
//.plugin(name: "Run Kotlin Tests",
47+
// capability: .command(
48+
// intent: .custom(verb: "skip-test", description: "Add Kotlin Targets to the current Package.swift"),
49+
// permissions: [
50+
// .writeToPackageDirectory(reason: "Skip needs to create and update the Skip folder in the project."),
51+
// ]),
52+
// dependencies: ["skiptool"],
53+
// path: "Plugins/RunGradleTests"),
5454

5555
.plugin(name: "Skip Custom Command",
5656
capability: .command(
@@ -61,14 +61,14 @@ let package = Package(
6161
dependencies: ["skiptool"],
6262
path: "Plugins/SkipCommand"),
6363

64-
.plugin(name: "Synchronize Gradle Project",
65-
capability: .command(
66-
intent: .custom(verb: "skip-sync", description: "Create local links to the transpiled gradle project(s)"),
67-
permissions: [
68-
.writeToPackageDirectory(reason: "Skip needs to create and update the Skip folder in the project."),
69-
]),
70-
dependencies: ["skiptool"],
71-
path: "Plugins/SynchronizeGradle"),
64+
//.plugin(name: "Synchronize Gradle Project",
65+
// capability: .command(
66+
// intent: .custom(verb: "skip-sync", description: "Create local links to the transpiled gradle project(s)"),
67+
// permissions: [
68+
// .writeToPackageDirectory(reason: "Skip needs to create and update the Skip folder in the project."),
69+
// ]),
70+
// dependencies: ["skiptool"],
71+
// path: "Plugins/SynchronizeGradle"),
7272

7373
.plugin(name: "skip-preflight",
7474
capability: .buildTool(),

0 commit comments

Comments
 (0)