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

Jump to bottom

build: use included build instead of buildSrc #1004

Closed
wants to merge 1 commit into from
Closed

build: use included build instead of buildSrc #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bots/cli/build.gradle
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
*/

plugins {
id 'org.openjdk.skara.gradle.images'
id 'images'
}

module {
Expand Down
21 changes: 16 additions & 5 deletions build.gradle
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've stumbled upon an outdated reference to buildSrc in the root build.gradle:

        // Force Gradle to load the JUnit Platform Launcher from the module-path, as
        // configured in buildSrc/.../ModulePlugin.java -- see SKARA-69 for details.
        testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.6.2'

https://github.com/openjdk/skara/pull/1004/files#diff-49a96e7eea8a94af862798a45174e6ac43eb4f8b4bd40759b5da63ba31ec3ef7L49-R62

Expand Up @@ -21,17 +21,28 @@
* questions.
*/

buildscript {
dependencies {
classpath 'org.openjdk.skara.gradle:reproduce'
classpath 'org.openjdk.skara.gradle:proxy'
classpath 'org.openjdk.skara.gradle:version'
classpath 'org.openjdk.skara.gradle:images'
classpath 'org.openjdk.skara.gradle:module'
}
}

plugins {
id 'org.openjdk.skara.gradle.proxy'
id 'org.openjdk.skara.gradle.version'
id 'org.openjdk.skara.gradle.reproduce'
id 'proxy'
id 'version'
id 'reproduce'
id 'images'
}

configure(subprojects.findAll() { it.name != 'bots' }) {
apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: 'org.openjdk.skara.gradle.module'
apply plugin: 'org.openjdk.skara.gradle.version'
apply plugin: 'module'
apply plugin: 'version'

group = 'org.openjdk.skara'

Expand Down
27 changes: 0 additions & 27 deletions buildSrc/settings.gradle
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cli/build.gradle
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
*/

plugins {
id 'org.openjdk.skara.gradle.images'
id 'images'
}

module {
Expand Down
0 buildSrc/.gitignore → gradle/plugins/.gitignore
View file
Open in desktop
File renamed without changes.
0 buildSrc/build.gradle → gradle/plugins/build.gradle
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion buildSrc/images/build.gradle → gradle/plugins/images-plugin/build.gradle
View file
Open in desktop
Expand Up @@ -25,10 +25,12 @@ plugins {
id 'java-gradle-plugin'
}

group = 'org.openjdk.skara.gradle'

gradlePlugin {
plugins {
simplePlugin {
id = 'org.openjdk.skara.gradle.images'
id = 'images'
implementationClass = 'org.openjdk.skara.gradle.images.ImagesPlugin'
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle/plugins/images-plugin/settings.gradle
View file
Open in desktop
@@ -0,0 +1 @@
rootProject.name = 'images'
0 .../skara/gradle/images/DownloadJDKTask.java → .../skara/gradle/images/DownloadJDKTask.java
View file
Open in desktop
File renamed without changes.
0 ...skara/gradle/images/ImageEnvironment.java → ...skara/gradle/images/ImageEnvironment.java
View file
Open in desktop
File renamed without changes.
0 ...jdk/skara/gradle/images/ImagesPlugin.java → ...jdk/skara/gradle/images/ImagesPlugin.java
View file
Open in desktop
File renamed without changes.
0 ...dk/skara/gradle/images/LaunchersTask.java → ...dk/skara/gradle/images/LaunchersTask.java
View file
Open in desktop
File renamed without changes.
0 ...openjdk/skara/gradle/images/LinkTask.java → ...openjdk/skara/gradle/images/LinkTask.java
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion buildSrc/module/build.gradle → gradle/plugins/module-plugin/build.gradle
View file
Open in desktop
Expand Up @@ -25,10 +25,12 @@ plugins {
id 'java-gradle-plugin'
}

group = 'org.openjdk.skara.gradle'

gradlePlugin {
plugins {
simplePlugin {
id = 'org.openjdk.skara.gradle.module'
id = 'module'
implementationClass = 'org.openjdk.skara.gradle.module.ModulePlugin'
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle/plugins/module-plugin/settings.gradle
View file
Open in desktop
@@ -0,0 +1 @@
rootProject.name = 'module'
0 .../skara/gradle/module/ModuleExtension.java → .../skara/gradle/module/ModuleExtension.java
View file
Open in desktop
File renamed without changes.
0 ...jdk/skara/gradle/module/ModulePlugin.java → ...jdk/skara/gradle/module/ModulePlugin.java
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion buildSrc/proxy/build.gradle → gradle/plugins/proxy-plugin/build.gradle
View file
Open in desktop
Expand Up @@ -25,10 +25,12 @@ plugins {
id 'java-gradle-plugin'
}

group = 'org.openjdk.skara.gradle'

gradlePlugin {
plugins {
simplePlugin {
id = 'org.openjdk.skara.gradle.proxy'
id = 'proxy'
implementationClass = 'org.openjdk.skara.gradle.proxy.ProxyPlugin'
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle/plugins/proxy-plugin/settings.gradle
View file
Open in desktop
@@ -0,0 +1 @@
rootProject.name = 'proxy'
0 ...enjdk/skara/gradle/proxy/ProxyPlugin.java → ...enjdk/skara/gradle/proxy/ProxyPlugin.java
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion buildSrc/reproduce/build.gradle → gradle/plugins/reproduce-plugin/build.gradle
View file
Open in desktop
Expand Up @@ -25,10 +25,12 @@ plugins {
id 'java-gradle-plugin'
}

group = 'org.openjdk.skara.gradle'

gradlePlugin {
plugins {
simplePlugin {
id = 'org.openjdk.skara.gradle.reproduce'
id = 'reproduce'
implementationClass = 'org.openjdk.skara.gradle.reproduce.ReproducePlugin'
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle/plugins/reproduce-plugin/settings.gradle
View file
Open in desktop
@@ -0,0 +1 @@
rootProject.name = 'reproduce'
0 ...ara/gradle/reproduce/ReproducePlugin.java → ...ara/gradle/reproduce/ReproducePlugin.java
View file
Open in desktop
File renamed without changes.
0 ...skara/gradle/reproduce/ReproduceTask.java → ...skara/gradle/reproduce/ReproduceTask.java
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion buildSrc/version/build.gradle → gradle/plugins/version-plugin/build.gradle
View file
Open in desktop
Expand Up @@ -25,10 +25,12 @@ plugins {
id 'java-gradle-plugin'
}

group = 'org.openjdk.skara.gradle'

gradlePlugin {
plugins {
simplePlugin {
id = 'org.openjdk.skara.gradle.version'
id = 'version'
implementationClass = 'org.openjdk.skara.gradle.version.VersionPlugin'
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle/plugins/version-plugin/settings.gradle
View file
Open in desktop
@@ -0,0 +1 @@
rootProject.name = 'version'
0 ...k/skara/gradle/version/VersionPlugin.java → ...k/skara/gradle/version/VersionPlugin.java
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions settings.gradle
View file
Open in desktop
Expand Up @@ -22,6 +22,12 @@
*/
rootProject.name = 'skara'

includeBuild 'gradle/plugins/proxy-plugin'
includeBuild 'gradle/plugins/module-plugin'
includeBuild 'gradle/plugins/images-plugin'
includeBuild 'gradle/plugins/version-plugin'
includeBuild 'gradle/plugins/reproduce-plugin'

include 'args'
include 'bot'
include 'ci'
Expand Down