Skip to content
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.

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

fix: use separate rewrite-polyglot version (#233) #235

Merged
merged 1 commit into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,13 @@ public String getRewriteVersion() {
return rewriteVersion;
}

private String rewritePolyglotVersion;
@Override
public String getRewritePolyglotVersion() {
if (rewriteVersion == null) {
if (rewritePolyglotVersion == null) {
return getVersionProps().getProperty("org.openrewrite:rewrite-polyglot");
}
return rewriteVersion;
return rewritePolyglotVersion;
}

private String rewriteGradleModelVersion;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Copyright ${year} the original author or authors.
* <p>
* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
* <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.
*/
package org.openrewrite.gradle

import org.assertj.core.api.Assertions.assertThat
import org.gradle.testkit.runner.TaskOutcome
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.io.TempDir
import java.io.File

class RewriteResolveDependenciesTest : RewritePluginTest {
@Test
fun `Specifying a rewriteVersion does not cause build failures`(
@TempDir projectDir: File
) {
gradleProject(projectDir) {
buildGradle("""
plugins {
id("java")
id("org.openrewrite.rewrite")
}

repositories {
mavenLocal()
mavenCentral()
maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
}
}

rewrite {
rewriteVersion = "8.6.1"
}
""")
}

val result = runGradle(projectDir, "rewriteResolveDependencies")
val rewriteDryRunResult = result.task(":rewriteResolveDependencies")!!
assertThat(rewriteDryRunResult.outcome).isEqualTo(TaskOutcome.SUCCESS)
}

}