Skip to content
This repository has been archived by the owner on Mar 1, 2022. It is now read-only.

Commit

Permalink
update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
feedm3 committed Apr 10, 2018
1 parent 026db9e commit 603a4b6
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/feedm3/spring-boot-gwt/blob/master)

This is a demo project to show Spring Boot in conjunction with GWT. It uses the latest dependencies
(Spring Boot 1.5.4 and GWT 2.8.1) and Java 8. The deployed app can be found [here](https://spring-boot-gwt.herokuapp.com/).
(Spring Boot 2.0.1 and GWT 2.8.2) and Java 8. The deployed app can be found [here](https://spring-boot-gwt.herokuapp.com/).

## Run

Expand Down
23 changes: 13 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ plugins {
id 'eclipse'
id 'groovy'
id 'idea'
id 'org.springframework.boot' version '1.5.4.RELEASE'
id 'com.github.ben-manes.versions' version '0.15.0'
id 'org.springframework.boot' version '2.0.1.RELEASE'
id 'com.github.ben-manes.versions' version '0.17.0'
}

apply plugin: 'io.spring.dependency-management'

sourceCompatibility = 1.8
targetCompatibility = 1.8
ext['spock.version'] = '1.1'
Expand All @@ -24,35 +26,36 @@ sourceSets {
}

dependencies {
compileOnly('com.google.gwt:gwt-user:2.8.1')
compileOnly('com.google.gwt:gwt-dev:2.8.1')
compileOnly('org.fusesource.restygwt:restygwt:2.2.0')
compileOnly('org.springframework.boot:spring-boot-configuration-processor')
compileOnly('com.google.gwt:gwt-user:2.8.2')
compileOnly('com.google.gwt:gwt-dev:2.8.2')
compileOnly('org.fusesource.restygwt:restygwt:2.2.3')

compile('javax.ws.rs:javax.ws.rs-api:2.1')
compile('org.springframework.boot:spring-boot-starter-data-jpa')
compile('org.springframework.boot:spring-boot-starter-jetty')
compile('org.springframework.boot:spring-boot-starter-web') {
exclude module: 'spring-boot-starter-tomcat'
}
compile('javax.ws.rs:javax.ws.rs-api:2.0.1')

runtime('com.h2database:h2')

testCompile('org.springframework.boot:spring-boot-starter-test')
testCompile('org.codehaus.groovy:groovy-all:2.4.5')
testCompile('org.codehaus.groovy:groovy-all:2.4.15')
testCompile('org.spockframework:spock-core:1.1-groovy-2.4')
testCompile('org.spockframework:spock-spring:1.1-groovy-2.4')

annotationProcessor('org.springframework.boot:spring-boot-configuration-processor')
}

task wrapper(type: Wrapper) {
gradleVersion = '4.0.1'
gradleVersion = '4.6'
}

task compileGwt(dependsOn: classes, type: JavaExec) {
ext.buildDir = "${project.buildDir}/gwt"
ext.extraDir = "${project.buildDir}/extra"

inputs.file sourceSets.main.java.srcDirs
inputs.files sourceSets.main.java.srcDirs
inputs.dir sourceSets.main.output.resourcesDir
outputs.dir buildDir

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Jul 19 09:50:53 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/codecrafters/SpringBootGwt.gwt.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5//EN"
"http://google-web-toolkit.googlecode.com/svn/releases/2.5/distro-source/core/src/gwt-module.dtd">
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN"
"http://gwtproject.org/doctype/2.8.2/gwt-module.dtd">
<module rename-to="springbootgwt">

<inherits name='com.google.gwt.user.User'/>
<inherits name="org.fusesource.restygwt.RestyGWT"/>

<entry-point class="com.codecrafters.client.SpringBootGwt"/>

<source path="client"/>

</module>
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package com.codecrafters.server
import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.databind.ObjectMapper
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.context.embedded.LocalServerPort
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.web.client.TestRestTemplate
import org.springframework.boot.web.server.LocalServerPort
import org.springframework.http.HttpEntity
import org.springframework.http.HttpMethod
import org.springframework.http.HttpStatus
Expand Down

0 comments on commit 603a4b6

Please sign in to comment.