Skip to content

Commit 018a3dc

Browse files
lacasseiolacasseio
committedFeb 13, 2021
Convert spaces to tabs
1 parent a769b51 commit 018a3dc

9 files changed

+560
-566
lines changed
 

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616

1717
subprojects {
18-
apply plugin: 'dev.gradleplugins.gradle-api-jar'
18+
apply plugin: 'dev.gradleplugins.gradle-api-jar'
1919
}
2020

2121
tasks.register('uploadGradleApiJars') {
22-
dependsOn(subprojects*.tasks*.bintrayUpload)
22+
dependsOn(subprojects*.tasks*.bintrayUpload)
2323
}

‎buildSrc/build.gradle

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
apply plugin: 'dev.gradleplugins.groovy-gradle-plugin'
22

33
gradlePlugin {
4-
plugins {
5-
generateGradleApiPlugin {
6-
id = 'dev.gradleplugins.gradle-api-jar'
7-
implementationClass = 'dev.gradleplugins.api.GenerateGradleApiJarPlugin'
8-
}
9-
}
4+
plugins {
5+
generateGradleApiPlugin {
6+
id = 'dev.gradleplugins.gradle-api-jar'
7+
implementationClass = 'dev.gradleplugins.api.GenerateGradleApiJarPlugin'
8+
}
9+
}
1010
}
1111

1212
repositories {
13-
jcenter()
14-
gradlePluginPortal()
15-
maven {
16-
url = uri('https://repo.gradle.org/gradle/libs-releases')
17-
}
18-
maven { url = 'https://repo.nokeedev.net/release' }
19-
maven { url = 'https://repo.nokeedev.net/snapshot' }
13+
jcenter()
14+
gradlePluginPortal()
15+
maven {
16+
url = uri('https://repo.gradle.org/gradle/libs-releases')
17+
}
18+
maven { url = 'https://repo.nokeedev.net/release' }
19+
maven { url = 'https://repo.nokeedev.net/snapshot' }
2020
}
2121

2222
dependencies {
23-
implementation gradleRunnerKit()
24-
implementation testFixtures(gradleRunnerKit())
25-
implementation testFixtures('dev.gradleplugins:gradle-fixtures-file-system:latest.release')
23+
implementation gradleRunnerKit()
24+
implementation testFixtures(gradleRunnerKit())
25+
implementation testFixtures('dev.gradleplugins:gradle-fixtures-file-system:latest.release')
2626

27-
implementation('dev.gradleplugins:gradle-plugin-development:1.1.34') {
28-
because 'we require access to the Gradle compatibility knowledge base'
29-
}
30-
implementation('com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4') {
31-
because 'we unfortunately use the bintray plugin to publish our JARs'
32-
}
27+
implementation('dev.gradleplugins:gradle-plugin-development:1.1.34') {
28+
because 'we require access to the Gradle compatibility knowledge base'
29+
}
30+
implementation('com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4') {
31+
because 'we unfortunately use the bintray plugin to publish our JARs'
32+
}
3333
}

‎buildSrc/settings.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
buildscript {
2-
repositories {
3-
gradlePluginPortal()
4-
maven { url = 'https://dl.bintray.com/gradle-plugins/distributions' }
5-
}
6-
dependencies {
7-
classpath 'dev.gradleplugins:gradle-plugin-development:1.1.35'
8-
}
2+
repositories {
3+
gradlePluginPortal()
4+
maven { url = 'https://dl.bintray.com/gradle-plugins/distributions' }
5+
}
6+
dependencies {
7+
classpath 'dev.gradleplugins:gradle-plugin-development:1.1.35'
8+
}
99
}
1010
apply plugin: 'dev.gradleplugins.gradle-plugin-development'

‎buildSrc/src/main/groovy/dev/gradleplugins/api/ExecuteGradleAction.groovy

+33-33
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ import org.gradle.workers.WorkAction
1111
import org.gradle.workers.WorkParameters
1212

1313
abstract class ExecuteGradleAction implements WorkAction<Parameters>, FileSystemFixture, GradleScriptFixture {
14-
static interface Parameters extends WorkParameters {
15-
DirectoryProperty getWorkingDirectory();
16-
DirectoryProperty getGradleUserHomeDirectory();
17-
18-
Property<String> getVersion();
19-
Property<String> getBuildscript();
20-
21-
ListProperty<String> getTasks();
22-
}
23-
24-
@Override
25-
File getTestDirectory() {
26-
return parameters.workingDirectory.get().asFile
27-
}
28-
29-
@Override
30-
void execute() {
31-
testDirectory.mkdirs()
32-
33-
writeBuildscriptFile()
34-
35-
GradleRunner.create(GradleExecutor.gradleTestKit())
36-
.inDirectory(testDirectory)
37-
.withGradleUserHomeDirectory(parameters.gradleUserHomeDirectory.get().asFile)
38-
.withGradleVersion(parameters.version.get())
39-
.withTasks(parameters.tasks.get())
40-
.withoutDeprecationChecks()
41-
.build()
42-
}
43-
44-
private void writeBuildscriptFile() {
45-
buildFile.text = parameters.buildscript.get()
46-
}
14+
static interface Parameters extends WorkParameters {
15+
DirectoryProperty getWorkingDirectory();
16+
DirectoryProperty getGradleUserHomeDirectory();
17+
18+
Property<String> getVersion();
19+
Property<String> getBuildscript();
20+
21+
ListProperty<String> getTasks();
22+
}
23+
24+
@Override
25+
File getTestDirectory() {
26+
return parameters.workingDirectory.get().asFile
27+
}
28+
29+
@Override
30+
void execute() {
31+
testDirectory.mkdirs()
32+
33+
writeBuildscriptFile()
34+
35+
GradleRunner.create(GradleExecutor.gradleTestKit())
36+
.inDirectory(testDirectory)
37+
.withGradleUserHomeDirectory(parameters.gradleUserHomeDirectory.get().asFile)
38+
.withGradleVersion(parameters.version.get())
39+
.withTasks(parameters.tasks.get())
40+
.withoutDeprecationChecks()
41+
.build()
42+
}
43+
44+
private void writeBuildscriptFile() {
45+
buildFile.text = parameters.buildscript.get()
46+
}
4747
}

‎buildSrc/src/main/groovy/dev/gradleplugins/api/GenerateGradleApiJar.groovy

+36-38
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ import groovy.transform.CompileStatic
2020
import org.gradle.api.DefaultTask
2121
import org.gradle.api.file.ConfigurableFileCollection
2222
import org.gradle.api.file.ProjectLayout
23-
import org.gradle.api.file.RegularFile
2423
import org.gradle.api.file.RegularFileProperty
2524
import org.gradle.api.provider.Property
26-
import org.gradle.api.provider.Provider
2725
import org.gradle.api.tasks.Classpath
2826
import org.gradle.api.tasks.Input
2927
import org.gradle.api.tasks.OutputFile
@@ -34,46 +32,46 @@ import javax.inject.Inject
3432

3533
@CompileStatic
3634
public abstract class GenerateGradleApiJar extends DefaultTask {
37-
@Input
38-
abstract Property<String> getVersion();
35+
@Input
36+
abstract Property<String> getVersion();
3937

40-
@Classpath
41-
abstract ConfigurableFileCollection getClasspath()
38+
@Classpath
39+
abstract ConfigurableFileCollection getClasspath()
4240

43-
@OutputFile
44-
abstract RegularFileProperty getOutputFile()
41+
@OutputFile
42+
abstract RegularFileProperty getOutputFile()
4543

46-
@Inject
47-
protected abstract WorkerExecutor getWorkerExecutor()
44+
@Inject
45+
protected abstract WorkerExecutor getWorkerExecutor()
4846

49-
@Inject
50-
protected abstract ProjectLayout getLayout()
47+
@Inject
48+
protected abstract ProjectLayout getLayout()
5149

52-
@Inject
53-
GenerateGradleApiJar() {
54-
getOutputFile().value(layout.buildDirectory.file(version.map { "gradle-user-home/caches/${it}/generated-gradle-jars/gradle-api-${it}.jar" })).disallowChanges()
55-
}
50+
@Inject
51+
GenerateGradleApiJar() {
52+
getOutputFile().value(layout.buildDirectory.file(version.map { "gradle-user-home/caches/${it}/generated-gradle-jars/gradle-api-${it}.jar" })).disallowChanges()
53+
}
5654

57-
@TaskAction
58-
private void doGenerate() {
59-
getWorkerExecutor().processIsolation {
60-
it.classpath.from(this.classpath)
61-
}.submit(ExecuteGradleAction.class) { param ->
62-
param.gradleUserHomeDirectory.set(layout.buildDirectory.dir('gradle-user-home'))
63-
param.workingDirectory.set(this.temporaryDir)
64-
param.version.set(this.version)
65-
param.buildscript.set('''
66-
|def configuration = configurations.create('generator')
67-
|dependencies {
68-
| generator gradleApi()
69-
|}
70-
|tasks.create('generate') {
71-
| doLast {
72-
| configuration.resolve()
73-
| }
74-
|}
75-
|'''.stripMargin())
76-
param.tasks.set(['generate'])
77-
}
78-
}
55+
@TaskAction
56+
private void doGenerate() {
57+
getWorkerExecutor().processIsolation {
58+
it.classpath.from(this.classpath)
59+
}.submit(ExecuteGradleAction.class) { param ->
60+
param.gradleUserHomeDirectory.set(layout.buildDirectory.dir('gradle-user-home'))
61+
param.workingDirectory.set(this.temporaryDir)
62+
param.version.set(this.version)
63+
param.buildscript.set('''
64+
|def configuration = configurations.create('generator')
65+
|dependencies {
66+
| generator gradleApi()
67+
|}
68+
|tasks.create('generate') {
69+
| doLast {
70+
| configuration.resolve()
71+
| }
72+
|}
73+
|'''.stripMargin())
74+
param.tasks.set(['generate'])
75+
}
76+
}
7977
}

‎buildSrc/src/main/groovy/dev/gradleplugins/api/GenerateGradleApiJarPlugin.groovy

+322-322
Large diffs are not rendered by default.

‎buildSrc/src/main/groovy/dev/gradleplugins/api/GenerateGradleSourceJar.groovy

+62-64
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ import groovy.transform.CompileStatic
2020
import org.gradle.api.DefaultTask
2121
import org.gradle.api.file.ConfigurableFileCollection
2222
import org.gradle.api.file.ProjectLayout
23-
import org.gradle.api.file.RegularFile
2423
import org.gradle.api.file.RegularFileProperty
2524
import org.gradle.api.provider.Property
26-
import org.gradle.api.provider.Provider
2725
import org.gradle.api.tasks.Classpath
2826
import org.gradle.api.tasks.Input
2927
import org.gradle.api.tasks.OutputFile
@@ -34,72 +32,72 @@ import javax.inject.Inject
3432

3533
@CompileStatic
3634
abstract class GenerateGradleSourceJar extends DefaultTask {
37-
@Input
38-
abstract Property<String> getVersion();
35+
@Input
36+
abstract Property<String> getVersion();
3937

40-
@Classpath
41-
abstract ConfigurableFileCollection getClasspath()
38+
@Classpath
39+
abstract ConfigurableFileCollection getClasspath()
4240

43-
@OutputFile
44-
abstract RegularFileProperty getOutputFile()
41+
@OutputFile
42+
abstract RegularFileProperty getOutputFile()
4543

46-
@Inject
47-
protected abstract WorkerExecutor getWorkerExecutor()
44+
@Inject
45+
protected abstract WorkerExecutor getWorkerExecutor()
4846

49-
@Inject
50-
protected abstract ProjectLayout getLayout()
47+
@Inject
48+
protected abstract ProjectLayout getLayout()
5149

52-
@Inject
53-
GenerateGradleSourceJar() {
54-
getOutputFile().value(layout.buildDirectory.file(version.map { "tmp/${this.name}/build/distributions/gradle-${it}-src.jar" })).disallowChanges()
55-
}
50+
@Inject
51+
GenerateGradleSourceJar() {
52+
getOutputFile().value(layout.buildDirectory.file(version.map { "tmp/${this.name}/build/distributions/gradle-${it}-src.jar" })).disallowChanges()
53+
}
5654

57-
@TaskAction
58-
private void doGenerate() {
59-
getWorkerExecutor().processIsolation {
60-
it.classpath.from(this.classpath)
61-
}.submit(ExecuteGradleAction.class) { param ->
62-
param.gradleUserHomeDirectory.set(layout.buildDirectory.dir('gradle-user-home'))
63-
param.workingDirectory.set(this.temporaryDir)
64-
param.version.set('6.5')
65-
param.buildscript.set("""
66-
|buildscript {
67-
| dependencies {
68-
| classpath 'io.github.http-builder-ng:http-builder-ng-core:1.0.4'
69-
| }
70-
| repositories {
71-
| mavenCentral()
72-
| }
73-
|}
74-
|
75-
|apply plugin: 'java'
76-
|import groovyx.net.http.HttpBuilder
77-
|import groovyx.net.http.optional.Download
78-
|tasks.create('download') {
79-
| ext.outputFile = file("gradle-src-${this.version.get()}.zip")
80-
| outputs.file(outputFile)
81-
| inputs.property('gradleVersion', gradle.gradleVersion)
82-
| doFirst {
83-
| File file = HttpBuilder.configure { request.uri = "https://services.gradle.org/distributions/gradle-${this.version.get()}-src.zip" }.get {
84-
| Download.toFile(delegate, outputFile)
85-
| }
86-
| }
87-
|}
88-
|tasks.create('generate', Zip) {
89-
| dependsOn(tasks.download)
90-
| from({zipTree(tasks.download.outputFile).matching { include('*/subprojects/*/src/*/**/*.java', '*/subprojects/*/src/*/**/*.groovy', '*/subprojects/*/src/*/**/*.kt').exclude('buildSrc/**/*') } }) {
91-
| eachFile {
92-
| relativePath = new RelativePath(relativePath.file, relativePath.segments.drop(6))
93-
| }
94-
| includeEmptyDirs = false
95-
| }
96-
| baseName = 'gradle'
97-
| version = '${this.getVersion().get()}'
98-
| extension = 'jar'
99-
| classifier = 'src'
100-
|}
101-
|""".stripMargin())
102-
param.tasks.set(['generate'])
103-
}
104-
}
55+
@TaskAction
56+
private void doGenerate() {
57+
getWorkerExecutor().processIsolation {
58+
it.classpath.from(this.classpath)
59+
}.submit(ExecuteGradleAction.class) { param ->
60+
param.gradleUserHomeDirectory.set(layout.buildDirectory.dir('gradle-user-home'))
61+
param.workingDirectory.set(this.temporaryDir)
62+
param.version.set('6.5')
63+
param.buildscript.set("""
64+
|buildscript {
65+
| dependencies {
66+
| classpath 'io.github.http-builder-ng:http-builder-ng-core:1.0.4'
67+
| }
68+
| repositories {
69+
| mavenCentral()
70+
| }
71+
|}
72+
|
73+
|apply plugin: 'java'
74+
|import groovyx.net.http.HttpBuilder
75+
|import groovyx.net.http.optional.Download
76+
|tasks.create('download') {
77+
| ext.outputFile = file("gradle-src-${this.version.get()}.zip")
78+
| outputs.file(outputFile)
79+
| inputs.property('gradleVersion', gradle.gradleVersion)
80+
| doFirst {
81+
| File file = HttpBuilder.configure { request.uri = "https://services.gradle.org/distributions/gradle-${this.version.get()}-src.zip" }.get {
82+
| Download.toFile(delegate, outputFile)
83+
| }
84+
| }
85+
|}
86+
|tasks.create('generate', Zip) {
87+
| dependsOn(tasks.download)
88+
| from({zipTree(tasks.download.outputFile).matching { include('*/subprojects/*/src/*/**/*.java', '*/subprojects/*/src/*/**/*.groovy', '*/subprojects/*/src/*/**/*.kt').exclude('buildSrc/**/*') } }) {
89+
| eachFile {
90+
| relativePath = new RelativePath(relativePath.file, relativePath.segments.drop(6))
91+
| }
92+
| includeEmptyDirs = false
93+
| }
94+
| baseName = 'gradle'
95+
| version = '${this.getVersion().get()}'
96+
| extension = 'jar'
97+
| classifier = 'src'
98+
|}
99+
|""".stripMargin())
100+
param.tasks.set(['generate'])
101+
}
102+
}
105103
}

‎buildSrc/src/main/groovy/dev/gradleplugins/api/GenerateGradleTestKitApiJar.groovy

+36-38
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ import groovy.transform.CompileStatic
2020
import org.gradle.api.DefaultTask
2121
import org.gradle.api.file.ConfigurableFileCollection
2222
import org.gradle.api.file.ProjectLayout
23-
import org.gradle.api.file.RegularFile
2423
import org.gradle.api.file.RegularFileProperty
2524
import org.gradle.api.provider.Property
26-
import org.gradle.api.provider.Provider
2725
import org.gradle.api.tasks.Classpath
2826
import org.gradle.api.tasks.Input
2927
import org.gradle.api.tasks.OutputFile
@@ -34,46 +32,46 @@ import javax.inject.Inject
3432

3533
@CompileStatic
3634
abstract class GenerateGradleTestKitApiJar extends DefaultTask {
37-
@Input
38-
abstract Property<String> getVersion();
35+
@Input
36+
abstract Property<String> getVersion();
3937

40-
@Classpath
41-
abstract ConfigurableFileCollection getClasspath()
38+
@Classpath
39+
abstract ConfigurableFileCollection getClasspath()
4240

43-
@OutputFile
44-
abstract RegularFileProperty getOutputFile()
41+
@OutputFile
42+
abstract RegularFileProperty getOutputFile()
4543

46-
@Inject
47-
protected abstract WorkerExecutor getWorkerExecutor()
44+
@Inject
45+
protected abstract WorkerExecutor getWorkerExecutor()
4846

49-
@Inject
50-
protected abstract ProjectLayout getLayout()
47+
@Inject
48+
protected abstract ProjectLayout getLayout()
5149

52-
@Inject
53-
GenerateGradleTestKitApiJar() {
54-
getOutputFile().value(layout.buildDirectory.file(version.map { "gradle-user-home/caches/${it}/generated-gradle-jars/gradle-test-kit-${it}.jar" })).disallowChanges()
55-
}
50+
@Inject
51+
GenerateGradleTestKitApiJar() {
52+
getOutputFile().value(layout.buildDirectory.file(version.map { "gradle-user-home/caches/${it}/generated-gradle-jars/gradle-test-kit-${it}.jar" })).disallowChanges()
53+
}
5654

57-
@TaskAction
58-
private void doGenerate() {
59-
getWorkerExecutor().processIsolation {
60-
it.getClasspath().from(this.classpath)
61-
}.submit(ExecuteGradleAction.class) { param ->
62-
param.gradleUserHomeDirectory.set(layout.buildDirectory.dir('gradle-user-home'))
63-
param.workingDirectory.set(this.temporaryDir)
64-
param.version.set(this.version)
65-
param.buildscript.set('''
66-
|def configuration = configurations.create('generator')
67-
|dependencies {
68-
| generator gradleTestKit()
69-
|}
70-
|tasks.create('generate') {
71-
| doLast {
72-
| configuration.resolve()
73-
| }
74-
|}
75-
|'''.stripMargin())
76-
param.tasks.set(['generate'])
77-
}
78-
}
55+
@TaskAction
56+
private void doGenerate() {
57+
getWorkerExecutor().processIsolation {
58+
it.getClasspath().from(this.classpath)
59+
}.submit(ExecuteGradleAction.class) { param ->
60+
param.gradleUserHomeDirectory.set(layout.buildDirectory.dir('gradle-user-home'))
61+
param.workingDirectory.set(this.temporaryDir)
62+
param.version.set(this.version)
63+
param.buildscript.set('''
64+
|def configuration = configurations.create('generator')
65+
|dependencies {
66+
| generator gradleTestKit()
67+
|}
68+
|tasks.create('generate') {
69+
| doLast {
70+
| configuration.resolve()
71+
| }
72+
|}
73+
|'''.stripMargin())
74+
param.tasks.set(['generate'])
75+
}
76+
}
7977
}

‎settings.gradle

+40-40
Original file line numberDiff line numberDiff line change
@@ -7,55 +7,55 @@ rootProject.name = 'gradle-api'
77
// Gradle APIs
88
@TupleConstructor
99
class VersionDownloadInfo {
10-
def json
10+
def json
1111

12-
String getVersion() {
13-
return json.version
14-
}
12+
String getVersion() {
13+
return json.version
14+
}
1515

16-
boolean isNotSnapshot() {
17-
return !json.snapshot
18-
}
16+
boolean isNotSnapshot() {
17+
return !json.snapshot
18+
}
1919

20-
boolean isNotReleaseCandidate() {
21-
return !json.version.contains("-rc-")
22-
}
20+
boolean isNotReleaseCandidate() {
21+
return !json.version.contains("-rc-")
22+
}
2323

24-
boolean isNotMilestone() {
25-
return !json.version.contains("-milestone-")
26-
}
24+
boolean isNotMilestone() {
25+
return !json.version.contains("-milestone-")
26+
}
2727

28-
boolean greaterOrEqualTo(String versionString) {
29-
return VersionNumber.parse(versionString).compareTo(VersionNumber.parse(json.version)) <= 0
30-
}
28+
boolean greaterOrEqualTo(String versionString) {
29+
return VersionNumber.parse(versionString).compareTo(VersionNumber.parse(json.version)) <= 0
30+
}
3131
}
3232
private Set<String> allGeneralAvailableVersion() {
33-
def versionInfo = new JsonSlurper().parseText('https://services.gradle.org/versions/all'.toURL().text).collect { new VersionDownloadInfo(it) }
34-
def result = versionInfo.findAll { it.notSnapshot && it.notReleaseCandidate && it.notMilestone && it.greaterOrEqualTo("2.14") }.collect { it.version }
35-
return result
33+
def versionInfo = new JsonSlurper().parseText('https://services.gradle.org/versions/all'.toURL().text).collect { new VersionDownloadInfo(it) }
34+
def result = versionInfo.findAll { it.notSnapshot && it.notReleaseCandidate && it.notMilestone && it.greaterOrEqualTo("2.14") }.collect { it.version }
35+
return result
3636
}
3737
allGeneralAvailableVersion().each { version ->
38-
include("${version}")
39-
project(":${version}").projectDir = file("subprojects/gradle-api-${version}")
38+
include("${version}")
39+
project(":${version}").projectDir = file("subprojects/gradle-api-${version}")
4040
}
4141

4242
plugins.withId('com.gradle.enterprise') {
43-
gradleEnterprise {
44-
buildScan {
45-
termsOfServiceUrl = "https://gradle.com/terms-of-service"
46-
termsOfServiceAgree = "yes"
47-
48-
if (System.getenv('CI')) {
49-
tag 'CI'
50-
} else {
51-
tag 'LOCAL'
52-
}
53-
54-
obfuscation {
55-
username { name -> 'super-human' }
56-
hostname { host -> 'somewhere' }
57-
ipAddresses { addresses -> addresses.collect { '1.2.3.4' } }
58-
}
59-
}
60-
}
61-
}
43+
gradleEnterprise {
44+
buildScan {
45+
termsOfServiceUrl = "https://gradle.com/terms-of-service"
46+
termsOfServiceAgree = "yes"
47+
48+
if (System.getenv('CI')) {
49+
tag 'CI'
50+
} else {
51+
tag 'LOCAL'
52+
}
53+
54+
obfuscation {
55+
username { name -> 'super-human' }
56+
hostname { host -> 'somewhere' }
57+
ipAddresses { addresses -> addresses.collect { '1.2.3.4' } }
58+
}
59+
}
60+
}
61+
}

0 commit comments

Comments
 (0)
Please sign in to comment.