Skip to content

Commit 0d3e5a6

Browse files
committed
Cleanup
1 parent 7c59a22 commit 0d3e5a6

File tree

6 files changed

+3
-94
lines changed

6 files changed

+3
-94
lines changed

build.gradle.kts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ plugins {
1919
id("maven-publish")
2020
id("groovy")
2121
id("com.gradle.plugin-publish") version "0.15.0"
22-
id("com.github.hierynomus.license") version "0.15.0"
2322
}
2423

2524
repositories {
26-
jcenter()
25+
mavenCentral()
2726
}
2827

2928
group = "de.jjohannes.gradle"
@@ -69,18 +68,3 @@ pluginBundle {
6968
vcsUrl = "https://github.com/jjohannes/extra-java-module-info.git"
7069
tags = listOf("java", "modularity", "jigsaw", "jpms")
7170
}
72-
73-
license {
74-
header = rootProject.file("config/HEADER.txt")
75-
strictCheck = true
76-
ignoreFailures = false
77-
mapping(mapOf(
78-
"java" to "SLASHSTAR_STYLE",
79-
"kt" to "SLASHSTAR_STYLE",
80-
"groovy" to "SLASHSTAR_STYLE",
81-
"kts" to "SLASHSTAR_STYLE"
82-
))
83-
ext.set("year", "2020")
84-
exclude("**/build/*")
85-
exclude("**/.gradle/*")
86-
}

src/functionalTest/groovy/de/jjohannes/gradle/javamodules/test/ExtraJavaModuleInfoTest.groovy

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
/*
2-
* Copyright 2020 the original author or authors.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (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-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
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
package de.jjohannes.gradle.javamodules.test
172

183
import org.gradle.testkit.runner.BuildResult

src/main/java/de/jjohannes/gradle/javamodules/ExtraModuleInfoPlugin.java

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
1-
/*
2-
* Copyright 2020 the original author or authors.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (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-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
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
package de.jjohannes.gradle.javamodules;
172

183
import org.gradle.api.Plugin;
194
import org.gradle.api.Project;
205
import org.gradle.api.artifacts.Configuration;
216
import org.gradle.api.attributes.Attribute;
227
import org.gradle.api.plugins.JavaPlugin;
23-
import org.gradle.util.VersionNumber;
8+
import org.gradle.util.GradleVersion;
249

2510
/**
2611
* Entry point of the plugin.
@@ -30,7 +15,7 @@ public class ExtraModuleInfoPlugin implements Plugin<Project> {
3015

3116
@Override
3217
public void apply(Project project) {
33-
if (VersionNumber.parse(project.getGradle().getGradleVersion()).compareTo(VersionNumber.parse("6.4-rc-1")) < 0) {
18+
if (GradleVersion.current().compareTo(GradleVersion.version("6.4-rc-1")) < 0) {
3419
throw new RuntimeException("This plugin requires Gradle 6.4+");
3520
}
3621

src/main/java/de/jjohannes/gradle/javamodules/ExtraModuleInfoPluginExtension.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
/*
2-
* Copyright 2020 the original author or authors.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (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-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
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
package de.jjohannes.gradle.javamodules;
172

183
import org.gradle.api.Action;

src/main/java/de/jjohannes/gradle/javamodules/ExtraModuleInfoTransform.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
/*
2-
* Copyright 2020 the original author or authors.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (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-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
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
package de.jjohannes.gradle.javamodules;
172

183
import org.gradle.api.artifacts.CacheableRule;

src/main/java/de/jjohannes/gradle/javamodules/ModuleInfo.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
/*
2-
* Copyright 2020 the original author or authors.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (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-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
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
package de.jjohannes.gradle.javamodules;
172

183
import java.io.Serializable;

0 commit comments

Comments
 (0)