Skip to content

Commit

Permalink
Corrections after testing with petclinic
Browse files Browse the repository at this point in the history
  • Loading branch information
BoykoAlex committed Aug 14, 2023
1 parent 741c1c5 commit a1b9f44
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 46 deletions.
1 change: 1 addition & 0 deletions sbm-gradle-tooling-model/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
id("org.openrewrite.build.root") version("latest.release")
}


allprojects {
group = "org.springframework.sbm.gradle.tooling"
description = "A model for extracting semantic information out of Gradle build files necessary for refactoring them."
Expand Down
2 changes: 1 addition & 1 deletion sbm-gradle-tooling-model/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.caching=true
org.gradle.parallel=true
git.root=/Users/aboyko/git/spring-boot-migrator
git.root=/..
24 changes: 23 additions & 1 deletion sbm-gradle-tooling-model/model/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
plugins {
id("org.openrewrite.build.language-library")
id("java")
id("nebula.maven-resolved-dependencies") version "18.4.0"
id("com.gradle.plugin-publish") version "1.1.0"
}

repositories {
if (!project.hasProperty("releasing")) {
mavenLocal {
mavenContent {
excludeVersionByRegex(".+", ".+", ".+-rc-?[0-9]*")
}
}

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

mavenCentral {
mavenContent {
excludeVersionByRegex(".+", ".+", ".+-rc-?[0-9]*")
}
}
}

dependencies {
Expand Down
4 changes: 3 additions & 1 deletion sbm-gradle-tooling-model/parser/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
plugins {
id("org.openrewrite.build.language-library")
id("java")
id("nebula.maven-resolved-dependencies") version "18.4.0"
id("com.gradle.plugin-publish") version "1.1.0"
}

group = "org.springframework.sbm.gradle.tooling"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

public class DefaultParserConfig implements ParseConfig {

private final List<String> activeStyles = new ArrayList<>();
private final List<String> exclusions = new ArrayList<>();
private final List<String> plainTextMasks = new ArrayList<>();

Expand Down Expand Up @@ -63,4 +64,9 @@ public int getSizeThresholdMb() {
return sizeThresholdMb;
}

@Override
public List<String> getActiveStyles() {
return activeStyles;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,13 @@ protected Environment environment() {
return environment;
}

public List<String> getActiveStyles() {
return new ArrayList<>(parserConfig.getActiveStyles());
}

private List<NamedStyles> getStyles() {
// if (styles == null) {
// styles = environment().activateStyles(getActiveStyles());
if (styles == null) {
styles = environment().activateStyles(getActiveStyles());
// File checkstyleConfig = extension.getCheckstyleConfigFile();
// if (checkstyleConfig != null && checkstyleConfig.exists()) {
// try {
Expand All @@ -175,7 +179,7 @@ private List<NamedStyles> getStyles() {
// logger.warn("Unable to parse Checkstyle configuration", e);
// }
// }
// }
}
return styles;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ public interface ParseConfig {

int getSizeThresholdMb();

List<String> getActiveStyles();

}
4 changes: 3 additions & 1 deletion sbm-gradle-tooling-model/plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
plugins {
id("org.openrewrite.build.language-library")
id("java")
id("nebula.maven-resolved-dependencies") version "18.4.0"
id("com.gradle.plugin-publish") version "1.1.0"
}

repositories {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ private static List<JavaSourceSetDataImpl> javaSourceSets(Project project) {
final SourceSet sourceSet = (SourceSet)var3.next();
sourceSetData.add(new JavaSourceSetDataImpl(
sourceSet.getName(),
sourceSet.getAllSource().getFiles(),
sourceSet.getResources().getSourceDirectories().getFiles(),
sourceSet.getAllJava().getFiles(),
sourceSet.getOutput().getClassesDirs().getFiles(),
sourceSet.getCompileClasspath().getFiles(),
sourceSet.getCompileClasspath().getFiles(),
javaSourceSetImplementationClasspath(project, sourceSet),
sourceSetJavaVersion(project, sourceSet)
));
Expand Down
38 changes: 0 additions & 38 deletions sbm-gradle-tooling-model/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,3 @@ rootProject.name = "sbm-gradle-tooling-model"
include("model")
include("plugin")
include("parser")

plugins {
id("com.gradle.enterprise") version "latest.release"
id("com.gradle.common-custom-user-data-gradle-plugin") version "latest.release"
}

gradleEnterprise {
val isCiServer = System.getenv("CI")?.equals("true") ?: false
server = "https://ge.openrewrite.org/"
val gradleCacheRemoteUsername: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
val gradleCacheRemotePassword: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")

buildCache {
remote(HttpBuildCache::class) {
url = uri("https://ge.openrewrite.org/cache/")
isPush = isCiServer
if (!gradleCacheRemoteUsername.isNullOrBlank() && !gradleCacheRemotePassword.isNullOrBlank()) {
credentials {
username = gradleCacheRemoteUsername
password = gradleCacheRemotePassword
}
}
}
}

buildScan {
capture {
isTaskInputFiles = true
}

isUploadInBackground = !isCiServer

publishAlways()
this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
publishIfAuthenticated()
}

}

0 comments on commit a1b9f44

Please sign in to comment.