Skip to content

Commit

Permalink
Sorta rough fix; GWT version will be matched to libGDX version
Browse files Browse the repository at this point in the history
This isn't futureproof, but since some files will probably need to be updated for a future major release, I think it's OK to match at least all of the libGDX 1.9.x versions.
  • Loading branch information
tommyettinger committed Sep 6, 2019
1 parent 9c7862b commit b6b4ad0
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildscript {
}
}

version = "1.9.10.0"
version = "1.9.10.1"
mainClassName = 'com.github.czyzby.setup.MainKt'

jar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ import com.github.czyzby.autumn.mvc.stereotype.preference.Property
*/
@Property("GwtVersion")
class GwtVersionPreference : AbstractStringPreference() {
override fun getDefault(): String = "2.8.0"
override fun getDefault(): String = "2.8.2"
}
7 changes: 4 additions & 3 deletions src/main/kotlin/com/github/czyzby/setup/views/advanced.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.github.czyzby.setup.views
import com.badlogic.gdx.scenes.scene2d.ui.Button
import com.github.czyzby.kiwi.util.common.Strings
import com.github.czyzby.lml.annotation.LmlActor
import com.kotcrab.vis.ui.widget.VisSelectBox
import com.kotcrab.vis.ui.widget.VisTextField
import com.kotcrab.vis.ui.widget.spinner.IntSpinnerModel
import com.kotcrab.vis.ui.widget.spinner.Spinner
Expand All @@ -21,7 +20,7 @@ class AdvancedData {
@LmlActor("androidPluginVersion") private lateinit var androidPluginVersionField: VisTextField
@LmlActor("robovmVersion") private lateinit var robovmVersionField: VisTextField
@LmlActor("moeVersion") private lateinit var moeVersionField: VisTextField
@LmlActor("gwtVersion") private lateinit var gwtVersionField: VisSelectBox<String>
// @LmlActor("gwtVersion") private lateinit var gwtVersionField: VisSelectBox<String>
@LmlActor("gwtPlugin") private lateinit var gwtPluginVersionField: VisTextField
@LmlActor("serverJavaVersion") private lateinit var serverJavaVersionField: Spinner
@LmlActor("desktopJavaVersion") private lateinit var desktopJavaVersionField: Spinner
Expand Down Expand Up @@ -64,7 +63,9 @@ class AdvancedData {
get() = moeVersionField.text

val gwtVersion: String
get() = gwtVersionField.selected
get() = if(gdxVersion.length == 5 && gdxVersion[4] != '9') {
if(gdxVersion[4] < '5') "2.6.1" else "2.8.0"
} else "2.8.2"

val gwtPluginVersion: String
get() = gwtPluginVersionField.text
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/github/czyzby/setup/views/mainView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class MainView : ActionContainer {
@LmlAction("show") fun getTabShowingAction(): Action = Actions.sequence(Actions.alpha(0f), Actions.fadeIn(0.1f))
@LmlAction("hide") fun getTabHidingAction(): Action = Actions.fadeOut(0.1f)
@LmlAction("gdxVersion") fun getGdxVersion(): String = Version.VERSION
@LmlAction("gwtVersions") fun getGwtVersions(): Array<String> = arrayOf("2.6.0", "2.6.1", "2.7.0", "2.8.0", "2.8.1, 2.8.2")
@LmlAction("gwtVersions") fun getGwtVersions(): Array<String> = arrayOf("2.8.2")
@LmlAction("jvmLanguages") fun getLanguages(): Array<String> = languagesData.languages
@LmlAction("jvmLanguagesVersions") fun getLanguagesVersions(): Array<String> = languagesData.versions
@LmlAction("templates") fun getOfficialTemplates(): Array<String> =
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/nls.properties
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ versionTip=Used as your application's version when building archives with Gradle
gdxVersion=LibGDX version:
gdxVersionTip=Version of the official LibGDX libraries. The latest release was {0}.
gwtVersion=GWT version:
gwtVersionTip=Version of GWT libraries. Should match version used to build the GWT backend. Defaults to 2.8.0. Other versions are NOT guaranteed to work out of the box due to API changes. Pre-1.9.5 LibGDX uses GWT 2.6.1.
gwtVersionTip=Version of GWT libraries. Should match version used to build the GWT backend. Defaults to 2.8.2. Other versions are NOT guaranteed to work out of the box due to API changes. Pre-1.9.5 LibGDX uses GWT 2.6.1, 1.9.5 to 1.9.8 used 2.8.0, 1.9.9 up use 2.8.2
gwtPlugin=GWT plugin version:
gwtPluginTip=Version of the Gradle plugin for GWT applications: de.richsource.gradle.plugins:gwt-gradle-plugin
sdkVersion=Target Android API:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/nls_pl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ versionTip=Wersja aplikacji u\u017Cywana przez Gradle przy budowaniu archiw\u00F
gdxVersion=Wersja LibGDX-a:
gdxVersionTip=Wersja oficjalnych bibliotek silnika LibGDX. Najnowsza wersja to {0}.
gwtVersion=Wersja GWT:
gwtVersionTip=Wersja bibliotek GWT. Powinna odpowiada\u0107 wersji u\u017Cytej do zbudowania backendu GWT. Domy\u015Blnie 2.8.0. NIE ma gwarancji, \u017Ce inne wersje b\u0119d\u0105 dzia\u0142a\u0107 z uwagi na zmiany w API. LibGDX przed wersj\u0105 1.9.5 u\u017Cywa\u0142 GWT 2.6.1.
gwtVersionTip=Wersja bibliotek GWT. Powinna odpowiada\u0107 wersji u\u017Cytej do zbudowania backendu GWT. Domy\u015Blnie 2.8.2. NIE ma gwarancji, \u017Ce inne wersje b\u0119d\u0105 dzia\u0142a\u0107 z uwagi na zmiany w API. LibGDX przed wersj\u0105 1.9.5 u\u017Cywa\u0142 GWT 2.6.1.
gwtPlugin=Wersja plugina GWT:
gwtPluginTip=Wersja plugina Gradle do aplikacji GWT: de.richsource.gradle.plugins:gwt-gradle-plugin
sdkVersion=Android API:
Expand Down
8 changes: 1 addition & 7 deletions src/main/resources/templates/tabs/advanced.lml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,8 @@
<textField id="robovmVersion" tooltip="@robovmVersionTip">2.3.6</textField>
@moeVersion
<textField id="moeVersion" tooltip="@moeVersionTip" row="true">1.4.0</textField>
@gwtVersion
<selectBox id="gwtVersion" tooltip="@gwtVersionTip" value="$getGwtVersion" onChange="setGwtVersion"
minWidth="20">
<:for version="$gwtVersions">{version}
</:for>
</selectBox>
@gwtPlugin
<textField id="gwtPlugin" tooltip="@gwtPluginTip" growX="true">1.0.6</textField>
<textField id="gwtPlugin" tooltip="@gwtPluginTip" growX="true">1.0.9</textField>
</table>
</scrollPane>
<table growX="true" defaultPad="2" defaultSpaceRight="10" defaultSpaceLeft="10">
Expand Down

0 comments on commit b6b4ad0

Please sign in to comment.