Skip to content

Commit

Permalink
Upgrade to Gradle 4.10.3
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennestuder committed Jan 12, 2019
1 parent 17c59c7 commit 4e39a3c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 34 deletions.
32 changes: 10 additions & 22 deletions build.gradle
@@ -1,21 +1,10 @@
buildscript {
repositories {
jcenter()
maven { url "https://plugins.gradle.org/m2" }
}
dependencies {
classpath "nu.studer:gradle-plugindev-plugin:$plugindevPluginVersion"
classpath "nu.studer:gradle-credentials-plugin:$credentialsPluginVersion"
classpath "com.gradle:build-scan-plugin:$buildScanPluginVersion"
}
plugins {
id 'com.gradle.build-scan' version '1.16'
id 'nu.studer.plugindev' version '1.0.12'
id 'nu.studer.credentials' version '1.0.5'
id 'groovy'
}

apply plugin: 'com.gradle.build-scan'
apply plugin: 'groovy'
apply plugin: 'java-gradle-plugin'
apply plugin: 'nu.studer.plugindev'
apply plugin: 'nu.studer.credentials'

group = 'nu.studer'
version = '3.0.3-DEV'

Expand All @@ -25,15 +14,14 @@ buildScan {
}

dependencies {
compile("org.jooq:jooq:$jooqVersion")
compile("org.jooq:jooq-meta:$jooqVersion")
compile("org.jooq:jooq-codegen:$jooqVersion")
compile("org.jooq:jooq:3.11.9")
compile("org.jooq:jooq-meta:3.11.9")
compile("org.jooq:jooq-codegen:3.11.9")

testCompile("org.spockframework:spock-core:$spockVersion-groovy-2.4") {
testCompile "com.h2database:h2:1.4.193"
testCompile("org.spockframework:spock-core:1.0-groovy-2.4") {
exclude module: 'groovy-all'
}

testCompile "com.h2database:h2:$h2Version"
}

plugindev {
Expand Down
11 changes: 3 additions & 8 deletions gradle.properties
@@ -1,9 +1,4 @@
# plugin dependency versions
plugindevPluginVersion = 1.0.6
credentialsPluginVersion = 1.0.4
buildScanPluginVersion = 1.14
org.gradle.caching=true
org.gradle.workers.max=3
org.gradle.jvmargs=-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8

# compile/runtime dependency versions
jooqVersion = 3.11.2
spockVersion=1.0
h2Version=1.4.193
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Mar 17 15:33:14 PDT 2017
#Fri Jan 11 18:47:39 PST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
2 changes: 0 additions & 2 deletions src/main/groovy/nu/studer/gradle/jooq/JooqTask.groovy
Expand Up @@ -23,7 +23,6 @@ import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFiles
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.ParallelizableTask
import org.gradle.api.tasks.TaskAction
import org.gradle.process.ExecResult
import org.gradle.process.JavaExecSpec
Expand All @@ -40,7 +39,6 @@ import javax.xml.validation.SchemaFactory
/**
* Gradle Task that runs the jOOQ source code generation.
*/
@ParallelizableTask
class JooqTask extends DefaultTask {

@Internal
Expand Down

0 comments on commit 4e39a3c

Please sign in to comment.