Skip to content

Commit

Permalink
Release 1.10.0.2 !
Browse files Browse the repository at this point in the history
This release fixes missing armeabi-v7a libraries on Android, and updates the KTX libs.
  • Loading branch information
tommyettinger committed Apr 24, 2021
1 parent 234312f commit dbadd49
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ hs_err_pid*
.attach_pid*

## Android:
android/libs/armeabi-v7a/
android/libs/arm64-v8a/
android/libs/x86/
android/libs/x86_64/
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ The official setup may transition to a web-based tool soon, but any user of the
formerly-reliable services went offline or had outages. This project provides another alternative setup tool based on
[SquidSetup](https://github.com/tommyettinger/SquidSetup), but removing the close ties to the SquidLib libraries to make it more general-use. Using SquidSetup's
code, which is built on czyzby's code, gives us working projects that use Gradle 7.0, ahead of 6.7.1 for the official setup and 4.0.2 for czyzby's gdx-setup.
The current Gradle version is 7.0 at the time of writing, and as of gdx-liftoff 1.10.0.1, new projects use that 7.0 version.
The current Gradle version is 7.0 at the time of writing, and since gdx-liftoff 1.10.0.1, new projects use that 7.0 version.
This allows new projects to "just work" on machines where Java 16 is the default, and the relatively small amount of configuration
changes needed for Gradle 7.0 are all handled by gdx-liftoff. There is an oddity with gdx-liftoff 1.10.0.1; HTML projects wouldn't build
changes needed for Gradle 7.0 are all handled by gdx-liftoff. There is an oddity with gdx-liftoff 1.10.0.1 and 1.10.0.2; HTML projects wouldn't build
correctly with Gradle 7.0 and the current version of the "gretty" Gradle plugin, 3.0.4. This has been addressed, somewhat clumsily, by
using [a fork of gretty](https://github.com/tommyettinger/gretty) and depending on it with JitPack, at least until the next gretty release.
This fork, like future versions of gretty, requires Gradle 7.0, but unlike gretty 4.x, it only requires a JDK 8 or higher.
This fork, like future versions of gretty, requires Gradle 7.0, but unlike gretty 4.x, it only requires a JDK 8 or higher, and it includes needed fixes.
Currently, gdx-liftoff projects depend on libGDX 1.10.0 by default, and allow using snapshots as well.
The current version of libGDX is 1.10.0, which had a longer release cycle because there was an emphasis on fixing bugs
in earlier releases. You can choose any released version of libGDX (or a nightly version) in the Advanced tab of the
Expand Down Expand Up @@ -75,10 +75,12 @@ for new projects generated by gdx-liftoff.
projects, but any extra usage info would help ensure that liftoff is ready for any libGDX usage. It isn't a
typical usage for a [GitHub Issue](https://github.com/tommyettinger/gdx-liftoff/issues), but sending any
feedback as an issue, whether it's "iOS projects work for me" or "iOS support is broken" would really help.
- Support for iOS should be better as of 1.10.0.1, but it could still use more testing. There are changes in
- Support for iOS should be better as of 1.10.0.2, but it could still use more testing. There are changes in
libGDX 1.10.0 that should really help iOS projects out of the box; if you encounter screen trouble with any
template applications, first add a Viewport like you would for any other platform, and see if there is still
an issue. If you still have clipping or a smaller view area, post an issue.
an issue. If you still have clipping or a smaller view area, post an issue. Several changes happened in
libGDX 1.10.0 to improve behavior on iOS, and gdx-liftoff may need to apply some changes to template code
for iOS projects to work more cleanly with libGDX 1.10.0 .
- Android should only be checked if you've set up your computer for Android development. Since gdx-liftoff uses
Gradle 7.0, having an Android project present shouldn't interfere with other platforms or IDE integration, as
long as your IDE supports Gradle 7.0 (Android Studio may in its most recent versions, but IntelliJ IDEA (and
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
}
}

version = "1.10.0.1"
version = "1.10.0.2"
mainClassName = 'com.github.czyzby.setup.MainKt'

jar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import com.kotcrab.vis.ui.widget.file.FileChooser
@Component
class Configuration {
companion object {
const val VERSION = "1.10.0.1"
const val VERSION = "1.10.0.2"
const val WIDTH = 600
const val HEIGHT = 700
const val PREFERENCES_PATH = "gdx-liftoff-prefs"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class Box2D : OfficialExtension() {
override fun initiate(project: Project) {
addDependency(project, Core.ID, "com.badlogicgames.gdx:gdx-box2d:\$gdxVersion")

addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-box2d-platform:\$gdxVersion:natives-armeabi-v7a")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-box2d-platform:\$gdxVersion:natives-arm64-v8a")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-box2d-platform:\$gdxVersion:natives-x86")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-box2d-platform:\$gdxVersion:natives-x86_64")
Expand Down Expand Up @@ -110,6 +111,7 @@ class Bullet : OfficialExtension() {
override fun initiate(project: Project) {
addDependency(project, Core.ID, "com.badlogicgames.gdx:gdx-bullet:\$gdxVersion")

addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-bullet-platform:\$gdxVersion:natives-armeabi-v7a")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-bullet-platform:\$gdxVersion:natives-arm64-v8a")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-bullet-platform:\$gdxVersion:natives-x86")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-bullet-platform:\$gdxVersion:natives-x86_64")
Expand Down Expand Up @@ -163,6 +165,7 @@ class Freetype : OfficialExtension() {
override fun initiate(project: Project) {
addDependency(project, Core.ID, "com.badlogicgames.gdx:gdx-freetype:\$gdxVersion")

addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-freetype-platform:\$gdxVersion:natives-armeabi-v7a")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-freetype-platform:\$gdxVersion:natives-arm64-v8a")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-freetype-platform:\$gdxVersion:natives-x86")
addNativeAndroidDependency(project, "com.badlogicgames.gdx:gdx-freetype-platform:\$gdxVersion:natives-x86_64")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import com.github.czyzby.setup.views.Extension
* Current version of KTX libraries.
* @author MJ
*/
// this will need updating when KTX uses 1.10.0
const val KTX_VERSION = "1.9.14-b2"
const val KTX_VERSION = "1.10.0-b1"

/**
* Kotlin utilities for Scene2D actors API.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,7 @@ class GdxBasisUniversal : ThirdPartyExtension() {
addDependency(project, LWJGL3.ID, "com.crashinvaders.basisu:basisu-wrapper:natives-desktop")
addDependency(project, Headless.ID, "com.crashinvaders.basisu:basisu-wrapper:natives-desktop")
addDependency(project, iOS.ID, "com.crashinvaders.basisu:basisu-wrapper:natives-ios")
addNativeAndroidDependency(project, "com.crashinvaders.basisu:basisu-wrapper:natives-armeabi-v7a")
addNativeAndroidDependency(project, "com.crashinvaders.basisu:basisu-wrapper:natives-arm64-v8a")
addNativeAndroidDependency(project, "com.crashinvaders.basisu:basisu-wrapper:natives-x86")
addNativeAndroidDependency(project, "com.crashinvaders.basisu:basisu-wrapper:natives-x86_64")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class AndroidGradleFile(val project: Project) : GradleFile(Android.ID) {
init {
dependencies.add("project(':${Core.ID}')")
addDependency("com.badlogicgames.gdx:gdx-backend-android:\$gdxVersion")
addNativeDependency("com.badlogicgames.gdx:gdx-platform:\$gdxVersion:natives-armeabi-v7a")
addNativeDependency("com.badlogicgames.gdx:gdx-platform:\$gdxVersion:natives-arm64-v8a")
addNativeDependency("com.badlogicgames.gdx:gdx-platform:\$gdxVersion:natives-x86")
addNativeDependency("com.badlogicgames.gdx:gdx-platform:\$gdxVersion:natives-x86_64")
Expand Down Expand Up @@ -166,12 +167,14 @@ ${joinDependencies(nativeDependencies, "natives")}
// so they get packed with the APK.
task copyAndroidNatives() {
doFirst {
file("libs/armeabi-v7a/").mkdirs()
file("libs/arm64-v8a/").mkdirs()
file("libs/x86_64/").mkdirs()
file("libs/x86/").mkdirs()
configurations.getByName("natives").copy().files.each { jar ->
def outputDir = null
if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/generator/gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ hs_err_pid*
.attach_pid*

## Android:
android/libs/armeabi-v7a/
android/libs/arm64-v8a/
android/libs/x86/
android/libs/x86_64/
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.0.1
1.10.0.2

0 comments on commit dbadd49

Please sign in to comment.