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

Introduce a way to split the plugin API from implementation #105

Merged
merged 10 commits into from
Jul 10, 2024
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "gradle/libraries/source-elements"]
path = gradle/libraries/source-elements
url = git@github.com:gradle-plugins/source-elements.git
[submodule "gradle/libraries/gradle-build-script"]
path = gradle/libraries/gradle-build-script
url = git@github.com:gradle-plugins/gradle-build-script.git
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:jbake-version: 1.7.2
:jbake-version: 1.8.0
// TODO: Add test for the version above
= Gradle Plugin Development Toolbox

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
allprojects {
group = 'dev.gradleplugins'
}
version = '1.7.2'
version = '1.8.0'

// Configure javadoc
allprojects {
Expand All @@ -19,7 +19,7 @@ allprojects {
// Configure gradle-fixtures-* versions
subprojects {
if (project.name.startsWith('gradle-fixtures') || project.name.startsWith('gradle-runner-kit')) {
version = '0.0.146'
version = '0.0.147'
}
}

Expand All @@ -45,4 +45,4 @@ tasks.register('check') {
group = 'verification'
dependsOn(gradle.includedBuild('testProjects').task(":groovy-gradle-plugin:check"))
dependsOn(gradle.includedBuild('testProjects').task(":java-gradle-plugin:check"))
}
}
2 changes: 1 addition & 1 deletion buildSrc/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
maven { url = 'https://repo.nokee.dev/release' }
}
dependencies {
classpath 'dev.gradleplugins:gradle-plugin-development:1.7.1'
classpath 'dev.gradleplugins:gradle-plugin-development:1.7.2'
}
}
apply plugin: 'dev.gradleplugins.gradle-plugin-development'
1 change: 1 addition & 0 deletions gradle/libraries/gradle-build-script
Submodule gradle-build-script added at e1c267
3 changes: 2 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ buildscript {
maven { url = 'https://repo.nokee.dev/release' }
}
dependencies {
classpath 'dev.gradleplugins:gradle-plugin-development:1.7.1'
classpath 'dev.gradleplugins:gradle-plugin-development:1.7.2'
}
}
apply plugin: 'dev.gradleplugins.gradle-plugin-development'

rootProject.name = 'toolbox'

includeBuild 'gradle/libraries/gradle-build-script'
includeBuild 'gradle/libraries/source-elements'
includeBuild 'subprojects/gradle-plugin-development-test-fixtures/testProjects'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

description = 'Gradle plugin development plugins test fixtures.'
version = '1.7.2'
version = '1.8.0'

dependencies {
compileOnly gradleApi(minimumGradleVersion)
Expand All @@ -27,4 +27,4 @@ sourceSets.main {
options.compilerArgs.add('-AbasePath=' + file('testProjects'))
inputs.files(fileTree('testProjects').include('**/*.java', '**/*.groovy'))
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'dev.gradleplugins.gradle-plugin-development' version '1.7.1'
id 'dev.gradleplugins.gradle-plugin-development' version '1.7.2'
}

include 'groovy-gradle-plugin'
Expand Down
2 changes: 1 addition & 1 deletion subprojects/gradle-plugin-development/README.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:jbake-version: 1.7.2
:jbake-version: 1.8.0
= Gradle Plugin Development Plugins

The Gradle plugin development plugins are a set of plugins accelerating Gradle plugin development.
Expand Down
3 changes: 2 additions & 1 deletion subprojects/gradle-plugin-development/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ apply plugin: 'dev.gradleplugins.gradle-plugin-unit-test'
apply plugin: 'dev.gradleplugins.gradle-plugin-functional-test'

description = 'Gradle plugin development plugins.'
version = '1.7.2'
version = '1.8.0'

gradlePlugin {
plugins {
Expand Down Expand Up @@ -125,6 +125,7 @@ functionalTest {
implementation "org.junit.jupiter:junit-jupiter:latest.release"
runtimeOnly "org.junit.vintage:junit-vintage-engine:latest.release"
implementation "org.hamcrest:hamcrest:2.2"
implementation "dev.gradleplugins:gradle-build-script"

// Force local fixtures
// TODO: Maybe look into dependency substitution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ abstract class AbstractGradlePluginDevelopmentFunctionalTestingFunctionalTest ex
buildFile << """
tasks.register('verify') {
doLast {
assert configurations.functionalTestImplementation.dependencies.any { it instanceof ${SelfResolvingDependencyInternal.canonicalName} ? it.targetComponentId.displayName == 'Gradle TestKit' : false }
assert configurations.functionalTestImplementation.incoming.dependencies.any { it instanceof ${SelfResolvingDependencyInternal.canonicalName} ? it.targetComponentId.displayName == 'Gradle TestKit' : false }
}
}
"""
Expand Down
Loading
Loading