diff options
13 files changed, 25 insertions, 25 deletions
diff --git a/backend/build.gradle b/backend/build.gradle index 73389ee8..a4526fb9 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -18,8 +18,8 @@ repositories { dependencies { compile 'com.google.code.gson:gson:2.8.0' compile 'ch.qos.logback:logback-classic:1.1.8' - compile 'org.hildan.livedoc:livedoc-springboot:0.4.0' - compile 'org.hildan.livedoc:livedoc-ui-webjar:0.4.0' + compile 'org.hildan.livedoc:livedoc-springboot:1.0.2' + compile 'org.hildan.livedoc:livedoc-ui-webjar:1.0.2' compile 'org.springframework.boot:spring-boot-starter-websocket' compile 'org.springframework.security:spring-security-core:4.2.0.RELEASE' diff --git a/backend/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java index e6ecaa17..f81ae09c 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java +++ b/backend/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java @@ -3,8 +3,8 @@ package org.luxons.sevenwonders.actions; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.hildan.livedoc.core.annotation.ApiObject; -import org.hildan.livedoc.core.annotation.ApiObjectField; +import org.hildan.livedoc.core.annotations.ApiObject; +import org.hildan.livedoc.core.annotations.ApiObjectField; @ApiObject(name = "Choose Name Action", description = "The action to choose the player's name. This is the first action that should be called.", diff --git a/backend/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java index 91984016..dc4113f0 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java +++ b/backend/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java @@ -3,8 +3,8 @@ package org.luxons.sevenwonders.actions; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.hildan.livedoc.core.annotation.ApiObject; -import org.hildan.livedoc.core.annotation.ApiObjectField; +import org.hildan.livedoc.core.annotations.ApiObject; +import org.hildan.livedoc.core.annotations.ApiObjectField; @ApiObject(name = "Create Game Action", description = "The action to create a game.", diff --git a/backend/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java index eeb3381a..ef0161b7 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java +++ b/backend/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java @@ -2,8 +2,8 @@ package org.luxons.sevenwonders.actions; import javax.validation.constraints.NotNull; -import org.hildan.livedoc.core.annotation.ApiObject; -import org.hildan.livedoc.core.annotation.ApiObjectField; +import org.hildan.livedoc.core.annotations.ApiObject; +import org.hildan.livedoc.core.annotations.ApiObjectField; @ApiObject(name = "Join Game Action", description = "The action to join a game.", diff --git a/backend/src/main/java/org/luxons/sevenwonders/actions/PrepareMoveAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/PrepareMoveAction.java index 5fd32c4c..bc3e6821 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/actions/PrepareMoveAction.java +++ b/backend/src/main/java/org/luxons/sevenwonders/actions/PrepareMoveAction.java @@ -2,8 +2,8 @@ package org.luxons.sevenwonders.actions; import javax.validation.constraints.NotNull; -import org.hildan.livedoc.core.annotation.ApiObject; -import org.hildan.livedoc.core.annotation.ApiObjectField; +import org.hildan.livedoc.core.annotations.ApiObject; +import org.hildan.livedoc.core.annotations.ApiObjectField; import org.luxons.sevenwonders.game.api.PlayerMove; @ApiObject(name = "Prepare Move Action", diff --git a/backend/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java index ba819fe0..705d768c 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java +++ b/backend/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java @@ -4,8 +4,8 @@ import java.util.List; import javax.validation.constraints.NotNull; -import org.hildan.livedoc.core.annotation.ApiObject; -import org.hildan.livedoc.core.annotation.ApiObjectField; +import org.hildan.livedoc.core.annotations.ApiObject; +import org.hildan.livedoc.core.annotations.ApiObjectField; @ApiObject(name = "Reorder Players Action", description = "The action to update the order of the players around the table. Can only be called in the " diff --git a/backend/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java index 410dd8ea..8806ced0 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java +++ b/backend/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java @@ -2,8 +2,8 @@ package org.luxons.sevenwonders.actions; import javax.validation.constraints.NotNull; -import org.hildan.livedoc.core.annotation.ApiObject; -import org.hildan.livedoc.core.annotation.ApiObjectField; +import org.hildan.livedoc.core.annotations.ApiObject; +import org.hildan.livedoc.core.annotations.ApiObjectField; import org.luxons.sevenwonders.game.api.CustomizableSettings; @ApiObject(name = "Update Settings Action", diff --git a/backend/src/main/java/org/luxons/sevenwonders/controllers/GameBrowserController.java b/backend/src/main/java/org/luxons/sevenwonders/controllers/GameBrowserController.java index 26250b8a..5f76e041 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/controllers/GameBrowserController.java +++ b/backend/src/main/java/org/luxons/sevenwonders/controllers/GameBrowserController.java @@ -4,8 +4,8 @@ import java.security.Principal; import java.util.Collection; import java.util.Collections; -import org.hildan.livedoc.core.annotation.Api; -import org.hildan.livedoc.core.annotation.ApiMethod; +import org.hildan.livedoc.core.annotations.Api; +import org.hildan.livedoc.core.annotations.ApiMethod; import org.luxons.sevenwonders.actions.CreateGameAction; import org.luxons.sevenwonders.actions.JoinGameAction; import org.luxons.sevenwonders.errors.ApiMisuseException; diff --git a/backend/src/main/java/org/luxons/sevenwonders/controllers/GameController.java b/backend/src/main/java/org/luxons/sevenwonders/controllers/GameController.java index e33d2012..41fd13f7 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/controllers/GameController.java +++ b/backend/src/main/java/org/luxons/sevenwonders/controllers/GameController.java @@ -3,8 +3,8 @@ package org.luxons.sevenwonders.controllers; import java.security.Principal; import java.util.List; -import org.hildan.livedoc.core.annotation.Api; -import org.hildan.livedoc.core.annotation.ApiMethod; +import org.hildan.livedoc.core.annotations.Api; +import org.hildan.livedoc.core.annotations.ApiMethod; import org.luxons.sevenwonders.actions.PrepareMoveAction; import org.luxons.sevenwonders.game.Game; import org.luxons.sevenwonders.game.api.PlayerTurnInfo; diff --git a/backend/src/main/java/org/luxons/sevenwonders/controllers/HomeController.java b/backend/src/main/java/org/luxons/sevenwonders/controllers/HomeController.java index 4e0c1083..c2b72637 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/controllers/HomeController.java +++ b/backend/src/main/java/org/luxons/sevenwonders/controllers/HomeController.java @@ -2,8 +2,8 @@ package org.luxons.sevenwonders.controllers; import java.security.Principal; -import org.hildan.livedoc.core.annotation.Api; -import org.hildan.livedoc.core.annotation.ApiMethod; +import org.hildan.livedoc.core.annotations.Api; +import org.hildan.livedoc.core.annotations.ApiMethod; import org.luxons.sevenwonders.actions.ChooseNameAction; import org.luxons.sevenwonders.lobby.Player; import org.luxons.sevenwonders.repositories.PlayerRepository; diff --git a/backend/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java b/backend/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java index ba4df70e..2a1d563d 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java +++ b/backend/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java @@ -3,8 +3,8 @@ package org.luxons.sevenwonders.controllers; import java.security.Principal; import java.util.Collections; -import org.hildan.livedoc.core.annotation.Api; -import org.hildan.livedoc.core.annotation.ApiMethod; +import org.hildan.livedoc.core.annotations.Api; +import org.hildan.livedoc.core.annotations.ApiMethod; import org.luxons.sevenwonders.actions.ReorderPlayersAction; import org.luxons.sevenwonders.actions.UpdateSettingsAction; import org.luxons.sevenwonders.errors.ApiMisuseException; diff --git a/backend/src/main/java/org/luxons/sevenwonders/doc/GlobalDocumentation.java b/backend/src/main/java/org/luxons/sevenwonders/doc/GlobalDocumentation.java index b1d64cab..560c5571 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/doc/GlobalDocumentation.java +++ b/backend/src/main/java/org/luxons/sevenwonders/doc/GlobalDocumentation.java @@ -1,7 +1,7 @@ package org.luxons.sevenwonders.doc; -import org.hildan.livedoc.core.annotation.global.ApiGlobal; -import org.hildan.livedoc.core.annotation.global.ApiGlobalSection; +import org.hildan.livedoc.core.annotations.global.ApiGlobal; +import org.hildan.livedoc.core.annotations.global.ApiGlobalSection; @ApiGlobal(sections = { @ApiGlobalSection(title = "First steps", paragraphs = {"Welcome to JsonDoc."}) diff --git a/frontend/package.json b/frontend/package.json index 25511ed0..d899eafc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -34,7 +34,7 @@ "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test --env=jsdom", - "test:oneshot": "set CI=true && react-scripts test --env=jsdom", + "test:oneshot": "CI=true react-scripts test --env=jsdom", "eject": "react-scripts eject", "prettier": "prettier-eslint --print-width 120 --write '{src,__{tests,mocks}__}/**/*.js'", "flow": "flow" |