Skip to content
This repository was archived by the owner on Apr 2, 2021. It is now read-only.

Commit fe3e9d7

Browse files
jameshilliardjohndevs
jameshilliard
authored and
johndevs
committed
Update gradle wrapper and fix gradle deprecation warnings.
1 parent 4376ea8 commit fe3e9d7

19 files changed

+101
-65
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
dist: xenial
12
language: groovy
23
jdk:
3-
- oraclejdk8
4+
- openjdk8
45
env:
56
- TEST_CATEGORY=uncategorizedTests
67
- TEST_CATEGORY=widgetsetCompileTests

‎build.gradle‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
2424
plugins {
2525
id 'java-gradle-plugin'
2626
id 'groovy'
27-
id 'maven'
27+
id 'maven-publish'
2828
id 'idea'
2929
id 'codenarc'
3030
id 'com.gradle.plugin-publish' version '0.10.0'
@@ -74,10 +74,6 @@ sourceSets {
7474
**********************************************************************************************************************/
7575
repositories{
7676
mavenCentral()
77-
maven { // FIXME For Junit 4.13-SNAPSHOT, remove when released
78-
name 'JBoss'
79-
url 'https://repository.jboss.org/'
80-
}
8177
}
8278

8379
configurations {
@@ -86,28 +82,28 @@ configurations {
8682
}
8783

8884
dependencies {
89-
compile gradleApi()
90-
compile localGroovy()
85+
implementation gradleApi()
86+
implementation localGroovy()
9187

9288
// Jetty application server
93-
compile "org.eclipse.jetty.aggregate:jetty-all:${project.property('jetty.version')}"
94-
compile "org.eclipse.jetty:jetty-annotations:${project.property('jetty.version')}"
95-
compile "org.eclipse.jetty:jetty-plus:${project.property('jetty.version')}"
96-
compile "org.eclipse.jetty:jetty-deploy:${project.property('jetty.version')}"
89+
implementation "org.eclipse.jetty.aggregate:jetty-all:${project.property('jetty.version')}"
90+
implementation "org.eclipse.jetty:jetty-annotations:${project.property('jetty.version')}"
91+
implementation "org.eclipse.jetty:jetty-plus:${project.property('jetty.version')}"
92+
implementation "org.eclipse.jetty:jetty-deploy:${project.property('jetty.version')}"
9793

9894
//Payara application server
99-
compile "fish.payara.extras:payara-embedded-web:${project.property('payara.version')}"
95+
implementation "fish.payara.extras:payara-embedded-web:${project.property('payara.version')}"
10096

10197
// For GET requests
102-
compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
98+
implementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
10399

104100
// Sass compilation with libSass
105-
compile "io.bit3:jsass:${project.property('jsass.version')}"
101+
implementation "io.bit3:jsass:${project.property('jsass.version')}"
106102

107103
deploy 'org.apache.maven.wagon:wagon-ssh:2.2'
108104

109-
testCompile gradleTestKit()
110-
testCompile 'junit:junit:4.13-SNAPSHOT'
105+
testImplementation gradleTestKit()
106+
testImplementation 'junit:junit:4.13-beta-3'
111107

112108
// ProxyTest needs its own special configuration to avoid conflicts
113109
proxyTest ('org.mock-server:mockserver-netty:3.10.4') {
@@ -176,7 +172,7 @@ jar {
176172
'Vaadin-Package-Version': 1,
177173
'Vaadin-License-Title': 'Apache 2.0',
178174
'Implementation-Title': 'Vaadin Plugin for Gradle',
179-
'Implementation-Version': version,
175+
'Implementation-Version': archiveVersion,
180176
'Implementation-Vendor': 'John Ahlroos',
181177
)
182178
}
@@ -188,7 +184,7 @@ jar {
188184
*/
189185
task sourcesJar(type: Jar) {
190186
from sourceSets.main.allSource
191-
classifier = 'sources'
187+
archiveClassifier.set('sources')
192188
include 'com/**/*.groovy'
193189
include 'com/**/*.java'
194190
}
@@ -235,7 +231,7 @@ task uncategorizedTests(type:Test, dependsOn:['test','jar']) {
235231
systemProperty 'integrationTestProjectVersion', version
236232
maxParallelForks = Runtime.runtime.availableProcessors() > 1 ? Runtime.runtime.availableProcessors() - 1 : 1
237233
testClassesDirs = sourceSets.functionalTest.output.classesDirs
238-
classpath = sourceSets.functionalTest.runtimeClasspath
234+
classpath += sourceSets.functionalTest.runtimeClasspath
239235
}
240236

241237
task widgetsetCompileTests(type:Test, dependsOn:['test','jar']) {
@@ -250,7 +246,7 @@ task widgetsetCompileTests(type:Test, dependsOn:['test','jar']) {
250246
systemProperty 'integrationTestProjectVersion', version
251247
maxParallelForks = Runtime.runtime.availableProcessors() > 1 ? Runtime.runtime.availableProcessors() - 1 : 1
252248
testClassesDirs = sourceSets.functionalTest.output.classesDirs
253-
classpath = sourceSets.functionalTest.runtimeClasspath
249+
classpath += sourceSets.functionalTest.runtimeClasspath
254250
}
255251

256252
task themeCompileTests(type:Test, dependsOn:['test','jar']) {
@@ -265,7 +261,7 @@ task themeCompileTests(type:Test, dependsOn:['test','jar']) {
265261
systemProperty 'integrationTestProjectVersion', version
266262
maxParallelForks = Runtime.runtime.availableProcessors() > 1 ? Runtime.runtime.availableProcessors() - 1 : 1
267263
testClassesDirs = sourceSets.functionalTest.output.classesDirs
268-
classpath = sourceSets.functionalTest.runtimeClasspath
264+
classpath += sourceSets.functionalTest.runtimeClasspath
269265
}
270266

271267
task fullCompileTests(type:Test, dependsOn:['test','jar']) {
@@ -279,7 +275,7 @@ task fullCompileTests(type:Test, dependsOn:['test','jar']) {
279275
systemProperty 'integrationTestProjectVersion', version
280276
maxParallelForks = Runtime.runtime.availableProcessors() > 1 ? Runtime.runtime.availableProcessors() - 1 : 1
281277
testClassesDirs = sourceSets.functionalTest.output.classesDirs
282-
classpath = sourceSets.functionalTest.runtimeClasspath
278+
classpath += sourceSets.functionalTest.runtimeClasspath
283279
}
284280

285281
task runProjectTests(type:Test, dependsOn:['test','jar']) {
@@ -293,7 +289,7 @@ task runProjectTests(type:Test, dependsOn:['test','jar']) {
293289
systemProperty 'integrationTestProjectVersion', version
294290
maxParallelForks = Runtime.runtime.availableProcessors() > 1 ? Runtime.runtime.availableProcessors() - 1 : 1
295291
testClassesDirs = sourceSets.functionalTest.output.classesDirs
296-
classpath = sourceSets.functionalTest.runtimeClasspath
292+
classpath += sourceSets.functionalTest.runtimeClasspath
297293
}
298294

299295
/**
@@ -307,7 +303,7 @@ task proxyTest(type:Test, dependsOn: ['test','jar']) {
307303
include '**/tests/*ProxyTest*'
308304
systemProperty 'integrationTestProjectVersion', version
309305
testClassesDirs = sourceSets.functionalTest.output.classesDirs
310-
classpath = configurations.proxyTest + sourceSets.functionalTest.runtimeClasspath
306+
classpath += configurations.proxyTest + sourceSets.functionalTest.runtimeClasspath
311307
}
312308

313309
/**
@@ -320,7 +316,7 @@ task allTests(type:Test, dependsOn:['test','jar']) {
320316
}
321317
systemProperty 'integrationTestProjectVersion', version
322318
testClassesDirs = sourceSets.functionalTest.output.classesDirs
323-
classpath = sourceSets.functionalTest.runtimeClasspath
319+
classpath += sourceSets.functionalTest.runtimeClasspath
324320
}
325321

326322
if(!ext.testCategory) {
@@ -353,7 +349,7 @@ codenarc{
353349
}
354350

355351
checkstyle {
356-
configDir = rootProject.file('config/checkstyle')
352+
configFile rootProject.file('config/checkstyle/checkstyle.xml')
357353
}
358354

359355
plugins.withType(GroovyBasePlugin) {

‎config/codenarc/ruleset.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ruleset {
127127
DuplicateListLiteral
128128
DuplicateMapLiteral
129129
DuplicateNumberLiteral
130-
DuplicateStringLiteral
130+
//DuplicateStringLiteral
131131

132132
// rulesets/enhanced.xml
133133
//CloneWithoutCloneable

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
jetty.version=9.4.5.v20170502
2-
payara.version=4.1.153
3-
jruby.version=9.1.10.0
4-
jsass.version=5.5.1
1+
jetty.version=9.4.21.v20190926
2+
payara.version=5.193
3+
jruby.version=9.2.8.0
4+
jsass.version=5.10.0
55
servlet.version=3.1.0
66
validation.api.version=1.0.0.GA
77
portlet.version=2.0

‎gradle/wrapper/gradle-wrapper.jar‎

-125 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS='"-Xmx64m"'
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
109125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110126
fi
111127

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116132
JAVACMD=`cygpath --unix "$JAVACMD"`

‎gradlew.bat‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS="-Xmx64m"
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

‎src/functionalTest/groovy/com/devsoap/plugin/tests/GradleVersionTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class GradleVersionTest extends IntegrationTest {
2222

2323
@Parameterized.Parameters(name = "Gradle {0}")
2424
static Collection<String> getGradleVersions() {
25-
[ '5.0']
25+
[ '5.6.2']
2626
}
2727

2828
@Override

‎src/functionalTest/groovy/com/devsoap/plugin/tests/MultimoduleWidgetsetThemeTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.devsoap.plugin.tests
22

3-
import com.devsoap.plugin.categories.WidgetsetCompile
3+
import com.devsoap.plugin.categories.WidgetsetAndThemeCompile
44
import com.devsoap.plugin.tasks.BuildClassPathJar
55
import com.devsoap.plugin.tasks.CreateComponentTask
66
import com.devsoap.plugin.tasks.CreateProjectTask
@@ -17,9 +17,9 @@ import static org.junit.Assert.assertTrue
1717
/**
1818
* Created by john on 1/11/17.
1919
*/
20+
@Category(WidgetsetAndThemeCompile)
2021
class MultimoduleWidgetsetThemeTest extends MultiProjectIntegrationTest {
2122

22-
@Category(WidgetsetCompile)
2323
@Test void 'Multimodule project with shared widgetset and theme'() {
2424
File widgetsetModule = makeProject('widgetset-module')
2525
File widgetsetBuildFile = makeBuildFile(widgetsetModule)

0 commit comments

Comments
 (0)