Skip to content
This repository was archived by the owner on May 12, 2025. It is now read-only.

Commit f17e8b1

Browse files
committed
add fixes
1 parent 15c2a70 commit f17e8b1

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
- name: npm install embedded
6060
run: |
6161
npm install @openrewrite/rewrite-remote
62-
npm install ../../../../openrewrite/openrewrite-rewrite-*.tgz
62+
npm install ../../../../../openrewrite/openrewrite-rewrite-*.tgz
6363
git checkout HEAD -- package.json
64-
working-directory: rewrite-javascript-remote-server/src/main/resources
64+
working-directory: rewrite-javascript-remote-server/src/main/resources/node-server
6565

6666
- name: publish-java-snapshots
6767
if: github.event_name != 'pull_request'

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ jobs:
7878
- name: npm install embedded
7979
run: |
8080
npm install @openrewrite/rewrite-remote
81-
npm install ../../../../openrewrite/openrewrite-rewrite-*.tgz
81+
npm install ../../../../../openrewrite/openrewrite-rewrite-*.tgz
8282
git checkout HEAD -- package.json
83-
working-directory: rewrite-javascript-remote-server/src/main/resources
83+
working-directory: rewrite-javascript-remote-server/src/main/resources/node-server
8484

8585
- name: publish-candidate
8686
if: contains(github.ref, '-rc.')

rewrite-javascript-remote-server/build.gradle.kts

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,29 @@ plugins {
44
id("org.openrewrite.build.language-library")
55
}
66

7+
8+
val latest = if (project.hasProperty("releasing")) "latest.release" else "latest.integration"
9+
dependencies {
10+
11+
implementation(project(":rewrite-javascript"))
12+
implementation(project(":rewrite-javascript-remote"))
13+
implementation(platform("org.openrewrite:rewrite-bom:$latest"))
14+
implementation("org.openrewrite:rewrite-java")
15+
implementation("org.openrewrite:rewrite-remote:$latest") {
16+
exclude(group = "org.openrewrite", module = "rewrite-javascript")
17+
}
18+
19+
compileOnly("org.assertj:assertj-core:latest.release")
20+
testImplementation("org.assertj:assertj-core:latest.release")
21+
testImplementation("org.junit.jupiter:junit-jupiter-api:latest.release")
22+
testImplementation("org.junit.jupiter:junit-jupiter-params:latest.release")
23+
testImplementation("org.openrewrite:rewrite-test")
24+
testImplementation("org.openrewrite.recipe:rewrite-static-analysis:${latest}")
25+
testImplementation("org.junit-pioneer:junit-pioneer:2.0.0")
26+
27+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:latest.release")
28+
}
29+
730
tasks.clean {
831
delete(projectDir.resolve("src/main/resources/package-lock.json"))
932
delete(projectDir.resolve("src/main/resources/node_modules"))
@@ -17,25 +40,10 @@ tasks.withType<LicenseCheck> {
1740
include("*.java")
1841
}
1942

20-
// We don't care about publishing javadocs anywhere, so don't waste time building them
21-
tasks.withType<Javadoc>().configureEach {
22-
enabled = false
23-
}
24-
25-
tasks.named<Jar>("sourcesJar") {
26-
enabled = false
27-
}
28-
29-
tasks.named<Jar>("javadocJar") {
30-
enabled = false
31-
}
32-
33-
val emptySourceJar = tasks.create<Jar>("emptySourceJar") {
34-
file("README.md")
35-
archiveClassifier.set("sources")
36-
}
3743

38-
val emptyJavadocJar = tasks.create<Jar>("emptyJavadocJar") {
39-
file("README.md")
40-
archiveClassifier.set("javadoc")
44+
tasks.withType<Javadoc> {
45+
options {
46+
this as CoreJavadocOptions
47+
addStringOption("Xdoclint:none", "-quiet")
48+
}
4149
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "@openrewrite/rewrite-bundled-starter",
3+
"version": "1.0.0",
4+
"description": "",
5+
"dependencies": {
6+
}
7+
}

rewrite-javascript/src/main/resources/META-INF/package.json

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
1-
/**
2-
* Copyright 2024 the original author or authors.
3-
* <p>
4-
* Licensed under the Moderne Source Available License (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
* <p>
8-
* https://docs.moderne.io/licensing/moderne-source-available-license
9-
* <p>
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
161
{
172
"name": "@openrewrite/rewrite-bundled-starter",
183
"version": "1.0.0",
194
"description": "",
205
"dependencies": {
21-
"@openrewrite/rewrite-remote": "~0.5.0",
6+
"@openrewrite/rewrite-remote": "~0.13.0",
227
"@openrewrite/rewrite": "~0.25.0"
238
},
249
"devDependencies": {

0 commit comments

Comments
 (0)