Skip to content

Commit

Permalink
add fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegDokuka committed Dec 18, 2024
1 parent 15c2a70 commit f17e8b1
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
- name: npm install embedded
run: |
npm install @openrewrite/rewrite-remote
npm install ../../../../openrewrite/openrewrite-rewrite-*.tgz
npm install ../../../../../openrewrite/openrewrite-rewrite-*.tgz
git checkout HEAD -- package.json
working-directory: rewrite-javascript-remote-server/src/main/resources
working-directory: rewrite-javascript-remote-server/src/main/resources/node-server

- name: publish-java-snapshots
if: github.event_name != 'pull_request'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ jobs:
- name: npm install embedded
run: |
npm install @openrewrite/rewrite-remote
npm install ../../../../openrewrite/openrewrite-rewrite-*.tgz
npm install ../../../../../openrewrite/openrewrite-rewrite-*.tgz
git checkout HEAD -- package.json
working-directory: rewrite-javascript-remote-server/src/main/resources
working-directory: rewrite-javascript-remote-server/src/main/resources/node-server

- name: publish-candidate
if: contains(github.ref, '-rc.')
Expand Down
48 changes: 28 additions & 20 deletions rewrite-javascript-remote-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,29 @@ plugins {
id("org.openrewrite.build.language-library")
}


val latest = if (project.hasProperty("releasing")) "latest.release" else "latest.integration"
dependencies {

implementation(project(":rewrite-javascript"))
implementation(project(":rewrite-javascript-remote"))
implementation(platform("org.openrewrite:rewrite-bom:$latest"))
implementation("org.openrewrite:rewrite-java")
implementation("org.openrewrite:rewrite-remote:$latest") {
exclude(group = "org.openrewrite", module = "rewrite-javascript")
}

compileOnly("org.assertj:assertj-core:latest.release")
testImplementation("org.assertj:assertj-core:latest.release")
testImplementation("org.junit.jupiter:junit-jupiter-api:latest.release")
testImplementation("org.junit.jupiter:junit-jupiter-params:latest.release")
testImplementation("org.openrewrite:rewrite-test")
testImplementation("org.openrewrite.recipe:rewrite-static-analysis:${latest}")
testImplementation("org.junit-pioneer:junit-pioneer:2.0.0")

testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:latest.release")
}

tasks.clean {
delete(projectDir.resolve("src/main/resources/package-lock.json"))
delete(projectDir.resolve("src/main/resources/node_modules"))
Expand All @@ -17,25 +40,10 @@ tasks.withType<LicenseCheck> {
include("*.java")
}

// We don't care about publishing javadocs anywhere, so don't waste time building them
tasks.withType<Javadoc>().configureEach {
enabled = false
}

tasks.named<Jar>("sourcesJar") {
enabled = false
}

tasks.named<Jar>("javadocJar") {
enabled = false
}

val emptySourceJar = tasks.create<Jar>("emptySourceJar") {
file("README.md")
archiveClassifier.set("sources")
}

val emptyJavadocJar = tasks.create<Jar>("emptyJavadocJar") {
file("README.md")
archiveClassifier.set("javadoc")
tasks.withType<Javadoc> {
options {
this as CoreJavadocOptions
addStringOption("Xdoclint:none", "-quiet")
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "@openrewrite/rewrite-bundled-starter",
"version": "1.0.0",
"description": "",
"dependencies": {
}
}
17 changes: 1 addition & 16 deletions rewrite-javascript/src/main/resources/META-INF/package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
/**
* Copyright 2024 the original author or authors.
* <p>
* Licensed under the Moderne Source Available License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* https://docs.moderne.io/licensing/moderne-source-available-license
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
{
"name": "@openrewrite/rewrite-bundled-starter",
"version": "1.0.0",
"description": "",
"dependencies": {
"@openrewrite/rewrite-remote": "~0.5.0",
"@openrewrite/rewrite-remote": "~0.13.0",
"@openrewrite/rewrite": "~0.25.0"
},
"devDependencies": {
Expand Down

0 comments on commit f17e8b1

Please sign in to comment.