Skip to content

Commit 9ebaf21

Browse files
jaredsburrowsjaredsburrows
committed
bring project up to date
1 parent a66df6e commit 9ebaf21

File tree

11 files changed

+203
-207
lines changed

11 files changed

+203
-207
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ before_install:
1818
- $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window & &>/dev/null
1919

2020
install:
21-
- ./gradlew clean build -s --scan
21+
- ./gradlew clean ktlintCheck build -s --scan
2222
- rm -rf ~/.m2/repository/com/jaredsburrows/gradle-spoon-plugin/ && ./gradlew publishMavenPublicationToMavenLocal -x test
2323

2424
before_script:

‎build.gradle

+35-37
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,75 @@
11
plugins {
2-
id "com.gradle.build-scan" version "1.16"
3-
id "com.jfrog.artifactory" version "4.7.5"
4-
id "com.jfrog.bintray" version "1.8.4"
5-
id "com.github.ben-manes.versions" version "0.20.0"
6-
id "com.gradle.plugin-publish" version "0.10.0"
7-
id "org.jetbrains.kotlin.jvm" version "1.2.70"
8-
id "org.jetbrains.dokka" version "0.9.17"
9-
id "java-gradle-plugin"
10-
id "groovy"
11-
id "maven-publish"
2+
id 'com.gradle.build-scan' version '1.16'
3+
id 'com.jfrog.artifactory' version '4.8.1'
4+
id 'com.jfrog.bintray' version '1.8.4'
5+
id 'com.github.ben-manes.versions' version '0.20.0'
6+
id 'com.gradle.plugin-publish' version '0.10.0'
7+
id 'org.jetbrains.kotlin.jvm' version '1.3.10'
8+
id 'org.jetbrains.dokka' version '0.9.17'
9+
id 'org.jlleitschuh.gradle.ktlint' version '6.1.0'
10+
id 'java-gradle-plugin'
11+
id 'groovy'
12+
id 'maven-publish'
1213
}
1314

1415
repositories {
1516
jcenter()
1617
google()
17-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // For Spoon snapshot, until 2.0.0 is released
18+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // For Spoon snapshot, until 2.0.0 is released
1819
}
1920

20-
apply from: "gradle/dependencies.gradle"
21+
apply from: 'gradle/dependencies.gradle'
2122

2223
group = GROUP
2324
version = VERSION_NAME
2425
description = POM_DESCRIPTION
2526

26-
sourceCompatibility = ext.javaVersion
27-
targetCompatibility = ext.javaVersion
27+
sourceCompatibility = versions.java
28+
targetCompatibility = versions.java
2829

2930
jar {
3031
manifest {
3132
attributes(
32-
"Implementation-Title": POM_NAME,
33-
"Implementation-Version": version,
34-
"Built-By": System.getProperty("user.name"),
35-
"Built-Date": new Date(),
36-
"Built-JDK": System.getProperty("java.version"),
37-
"Built-Gradle": gradle.gradleVersion)
33+
'Implementation-Title': POM_NAME,
34+
'Implementation-Version': version,
35+
'Built-By': System.getProperty('user.name'),
36+
'Built-Date': new Date(),
37+
'Built-JDK': System.getProperty('java.version'),
38+
'Built-Gradle': gradle.gradleVersion)
3839
}
3940
}
4041

4142
configurations.all {
42-
resolutionStrategy.cacheDynamicVersionsFor 0, "seconds"
43+
resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds'
4344

4445
resolutionStrategy {
4546
eachDependency { details ->
46-
if (details.requested.name == "kotlin-stdlib-jre8") {
47-
details.useTarget group: details.requested.group, name: "kotlin-stdlib-jdk8", version: details.requested.version
48-
}
49-
if (details.requested.name == "kotlin-stdlib-jre7") {
50-
details.useTarget group: details.requested.group, name: "kotlin-stdlib-jre7", version: details.requested.version
47+
if (details.requested.group == 'org.jetbrains.kotlin') {
48+
details.useVersion versions.kotlin
5149
}
5250
}
5351
}
5452
}
5553

5654
dependencies {
57-
implementation deps.kotlinStdlib
58-
implementation deps.kotlinReflect
59-
implementation deps.gradle
60-
implementation deps.spoonRunner
61-
implementation deps.ddmlib
55+
implementation deps.kotlin.stdlib.jdk
56+
implementation deps.kotlin.reflect
57+
implementation deps.spoon.runner
58+
implementation deps.android.tools.build.gradle
59+
implementation deps.android.tools.ddmlib
6260

6361
testImplementation localGroovy()
64-
testImplementation deps.spockCore, { exclude module: "groovy-all" } // Use localGroovy()
62+
testImplementation deps.spock, { exclude module: 'groovy-all' } // Use localGroovy()
6563
}
6664

67-
apply from: "gradle/scan.gradle"
68-
apply from: "gradle/compile.gradle"
69-
apply from: "gradle/plugin.gradle"
70-
apply from: "gradle/publish.gradle"
65+
apply from: 'gradle/scan.gradle'
66+
apply from: 'gradle/compile.gradle'
67+
apply from: 'gradle/plugin.gradle'
68+
apply from: 'gradle/publish.gradle'
7169

7270
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
7371
kotlinOptions {
74-
jvmTarget = rootProject.ext.javaVersion
72+
jvmTarget = rootProject.versions.java
7573
allWarningsAsErrors = true
7674
}
7775
}

‎gradle/compile.gradle

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
tasks.withType(JavaCompile) {
2-
sourceCompatibility = rootProject.ext.javaVersion
3-
targetCompatibility = rootProject.ext.javaVersion
2+
sourceCompatibility = rootProject.versions.java
3+
targetCompatibility = rootProject.versions.java
44

55
// Show all warnings except boot classpath
66
configure(options) {
7-
compilerArgs << "-Xlint:all" // Turn on all warnings
8-
compilerArgs << "-Werror" // Turn warnings into errors
9-
encoding = "utf-8"
7+
compilerArgs << '-Xlint:all' // Turn on all warnings
8+
compilerArgs << '-Werror' // Turn warnings into errors
9+
encoding = 'utf-8'
1010
fork = true
1111
}
1212
}
1313

1414
tasks.withType(GroovyCompile) {
15-
sourceCompatibility = rootProject.ext.javaVersion
16-
targetCompatibility = rootProject.ext.javaVersion
15+
sourceCompatibility = rootProject.versions.java
16+
targetCompatibility = rootProject.versions.java
1717

1818
// Show all warnings except boot classpath
1919
configure(options) {
20-
compilerArgs << "-Xlint:all" // Turn on all warnings
21-
compilerArgs << "-Werror" // Turn warnings into errors
22-
encoding = "utf-8"
20+
compilerArgs << '-Xlint:all' // Turn on all warnings
21+
compilerArgs << '-Werror' // Turn warnings into errors
22+
encoding = 'utf-8'
2323
fork = true
2424
}
2525

2626
configure(groovyOptions) {
27-
encoding = "utf-8"
27+
encoding = 'utf-8'
2828
fork = true
2929
}
3030
}
3131

3232
tasks.withType(Test) {
3333
// Turn on logging for all tests, filter to show failures/skips only
3434
testLogging {
35-
exceptionFormat "full"
35+
exceptionFormat 'full'
3636
showCauses true
3737
showExceptions true
3838
showStackTraces true
39-
events "failed", "skipped"
39+
events 'failed', 'skipped'
4040
}
4141

4242
failFast = true
@@ -47,32 +47,32 @@ tasks.withType(Javadoc) {
4747
title = "${project.name} ${project.version}"
4848
configure(options) {
4949
header = project.name
50-
encoding "UTF-8"
51-
docEncoding "UTF-8"
52-
charSet "UTF-8"
50+
encoding 'UTF-8'
51+
docEncoding 'UTF-8'
52+
charSet 'UTF-8'
5353
linkSource true
5454
author = true
55-
links("http://docs.oracle.com/javase/8/docs/api/",
56-
"http://docs.oracle.com/javaee/7/api/")
55+
links('http://docs.oracle.com/javase/8/docs/api/',
56+
'http://docs.oracle.com/javaee/7/api/')
5757
exclude "**/*Test.java"
58-
if (JavaVersion.current().java8Compatible) addStringOption("Xdoclint:none", "-quiet")
58+
if (JavaVersion.current().java8Compatible) addStringOption('Xdoclint:none', '-quiet')
5959
}
6060
}
6161

6262
tasks.withType(Groovydoc) {
63-
docTitle = "${project.name} ${project.version}"
63+
docTitle = '${project.name} ${project.version}'
6464
header = project.name
65-
link("http://docs.oracle.com/javase/8/docs/api/",
66-
"http://docs.oracle.com/javaee/7/api/",
67-
"http://groovy.codehaus.org/gapi/")
65+
link('http://docs.oracle.com/javase/8/docs/api/',
66+
'http://docs.oracle.com/javaee/7/api/',
67+
'http://groovy.codehaus.org/gapi/')
6868
exclude "**/*Spec.java"
6969
}
7070

7171
// Prevent forked processes from stealing focus (on MacOS at least)
7272
tasks.withType(JavaForkOptions) {
7373
// should improve memory on a 64bit JVM
74-
jvmArgs "-XX:+UseCompressedOops"
74+
jvmArgs '-XX:+UseCompressedOops'
7575
// should avoid GradleWorkerMain to steal focus
76-
jvmArgs "-Djava.awt.headless=true"
77-
jvmArgs "-Dapple.awt.UIElement=true"
76+
jvmArgs '-Djava.awt.headless=true'
77+
jvmArgs '-Dapple.awt.UIElement=true'
7878
}

‎gradle/dependencies.gradle

+49-35
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,52 @@
1-
ext {
2-
javaVersion = "1.8"
3-
agpVersion = rootProject.hasProperty("agpVersion") ? rootProject.property("agpVersion") : "3.0.1"
4-
kotlinVersion = "1.2.70"
5-
minSdkVersion = 19
6-
targetSdkVersion = 28
7-
compileSdkVersion = 28
8-
spoonVersion = "2.0.0-SNAPSHOT"
9-
jacocoVersion = "0.7.4.201502262128"
10-
}
11-
12-
ext.deps = [
13-
// plugin
14-
"gradle" : "com.android.tools.build:gradle:$agpVersion",
15-
"kotlinGradlePlugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion",
16-
17-
// implementation
18-
"kotlinStdlib" : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion",
19-
"kotlinReflect" : "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion",
20-
"spoonRunner" : "com.squareup.spoon:spoon-runner:$spoonVersion",
21-
"ddmlib" : "com.android.tools.ddms:ddmlib:26.0.0",
22-
23-
// testImplementation
24-
"junit" : "junit:junit:4.12",
25-
"truth" : "com.google.truth:truth:0.36",
26-
"spockCore" : "org.spockframework:spock-core:1.1-groovy-2.4",
27-
28-
// androidTestImplementation
29-
"spoonClient" : "com.squareup.spoon:spoon-client:$spoonVersion",
30-
"runner" : "com.android.support.test:runner:0.5",
31-
"rules" : "com.android.support.test:rules:0.5",
1+
ext.buildConfig = [
2+
'compileSdk': 28,
3+
'minSdk' : 19,
4+
'targetSdk' : 28,
5+
'signing' : [
6+
'alias' : "androiddebugkey",
7+
'password': "android"
8+
]
9+
]
3210

33-
// jacocoAgent/androidJacocoAgent
34-
"orgJacocoAgent" : "org.jacoco:org.jacoco.agent:$jacocoVersion",
11+
ext.versions = [
12+
'agp' : '3.2.1',
13+
'java' : '1.8',
14+
'kotlin': '1.3.10',
15+
'spoon' : '2.0.0-SNAPSHOT',
16+
'jacoco': '0.7.9'
17+
]
3518

36-
// jacocoAnt/androidJacocoAnt
37-
"orgJacocoAnt" : "org.jacoco:org.jacoco.ant:$jacocoVersion"
19+
ext.deps = [
20+
'kotlin' : [
21+
'stdlib' : [
22+
'jdk': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
23+
],
24+
'gradle' : [
25+
'plugin': "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
26+
],
27+
'reflect': "org.jetbrains.kotlin:kotlin-reflect:$versions.kotlin"
28+
],
29+
'spoon' : [
30+
'runner': "com.squareup.spoon:spoon-runner:$versions.spoon",
31+
'client': "com.squareup.spoon:spoon-client:$versions.spoon"
32+
],
33+
'android': [
34+
'tools': [
35+
'build' : [
36+
'gradle': "com.android.tools.build:gradle:$versions.agp",
37+
],
38+
'ddmlib': 'com.android.tools.ddms:ddmlib:26.0.0',
39+
],
40+
'test' : [
41+
'runner': 'com.android.support.test:runner:0.5',
42+
'rules' : 'com.android.support.test:rules:0.5',
43+
]
44+
],
45+
'spock' : 'org.spockframework:spock-core:1.1-groovy-2.4',
46+
'junit' : 'junit:junit:4.12',
47+
'truth' : 'com.google.truth:truth:0.36',
48+
'jaococ' : [
49+
'agent': "org.jacoco:org.jacoco.agent:$versions.jacoco",
50+
'ant' : "org.jacoco:org.jacoco.ant:$versions.jacoco",
51+
]
3852
]

0 commit comments

Comments
 (0)