Merge pull request #105 from gradle-plugins/develop/api

Introduce a way to split the plugin API from implementation

.gitmodules

@@ -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

README.adoc

@@ -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
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
 allprojects {
     group = 'dev.gradleplugins'
 }
-version = '1.7.2'
+version = '1.8.0'
 
 // Configure javadoc
 allprojects {
@@ -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'
     }
 }
 
@@ -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"))
-}
+}

buildSrc/settings.gradle

@@ -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'

settings.gradle

@@ -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'
 

subprojects/gradle-plugin-development-test-fixtures/build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 description = 'Gradle plugin development plugins test fixtures.'
-version = '1.7.2'
+version = '1.8.0'
 
 dependencies {
     compileOnly gradleApi(minimumGradleVersion)
@@ -27,4 +27,4 @@ sourceSets.main {
         options.compilerArgs.add('-AbasePath=' + file('testProjects'))
         inputs.files(fileTree('testProjects').include('**/*.java', '**/*.groovy'))
     }
-}
+}

subprojects/gradle-plugin-development-test-fixtures/testProjects/settings.gradle

@@ -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'

subprojects/gradle-plugin-development/README.adoc

@@ -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.

subprojects/gradle-plugin-development/build.gradle

@@ -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 {
@@ -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

subprojects/gradle-plugin-development/src/functionalTest/groovy/dev/gradleplugins/GradlePluginDevelopmentFunctionalTestingFunctionalTest.groovy

@@ -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 }
                 }
             }
         """