From 97a3ea71b64893e3b7ef7c37b9fdda9c8eac2959 Mon Sep 17 00:00:00 2001 From: gallegonovato Date: Sat, 19 Aug 2023 10:43:06 +0000 Subject: [PATCH 1/6] Translated using Weblate (Spanish) Currently translated at 100.0% (16 of 16 strings) Translation: Halma/Metadata Translate-URL: https://hosted.weblate.org/projects/halma/metadata/es/ --- fastlane/metadata/android/es-ES/changelogs/11.txt | 4 ++++ fastlane/metadata/android/es-ES/changelogs/12.txt | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 fastlane/metadata/android/es-ES/changelogs/11.txt create mode 100644 fastlane/metadata/android/es-ES/changelogs/12.txt diff --git a/fastlane/metadata/android/es-ES/changelogs/11.txt b/fastlane/metadata/android/es-ES/changelogs/11.txt new file mode 100644 index 0000000..b04039b --- /dev/null +++ b/fastlane/metadata/android/es-ES/changelogs/11.txt @@ -0,0 +1,4 @@ +- Target Android 13 (requisito de Google) + +Sie bienvenido a abrir problemas en https://github.com/Crazy-Marvin/Halma y ayuda con las traducciones en https://hosted.weblate.org/engage/halma/. +¡Muchas gracias a todos los colaboradores! 😘 diff --git a/fastlane/metadata/android/es-ES/changelogs/12.txt b/fastlane/metadata/android/es-ES/changelogs/12.txt new file mode 100644 index 0000000..54e472f --- /dev/null +++ b/fastlane/metadata/android/es-ES/changelogs/12.txt @@ -0,0 +1,4 @@ +- + +Por favor, se bienvenido a abrir problemas en https://github.com/Crazy-Marvin/Halma y ayudar con las traducciones en https://hosted.weblate.org/engage/halma/. +¡Muchas gracias a todos los colaboradores! 😘 From 90bf77ade704f910adf3a7b74e8d04cca38ec5fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 19:51:59 +0000 Subject: [PATCH 2/6] Bump gdxVersion from 1.11.0 to 1.12.0 Bumps `gdxVersion` from 1.11.0 to 1.12.0. Updates `com.badlogicgames.gdx:gdx-backend-lwjgl3` from 1.11.0 to 1.12.0 - [Release notes](https://github.com/libgdx/libgdx/releases) - [Changelog](https://github.com/libgdx/libgdx/blob/master/CHANGES) - [Commits](https://github.com/libgdx/libgdx/compare/1.11.0...1.12.0) Updates `com.badlogicgames.gdx:gdx-backend-android` from 1.11.0 to 1.12.0 - [Release notes](https://github.com/libgdx/libgdx/releases) - [Changelog](https://github.com/libgdx/libgdx/blob/master/CHANGES) - [Commits](https://github.com/libgdx/libgdx/compare/1.11.0...1.12.0) Updates `com.badlogicgames.gdx:gdx-backend-gwt` from 1.11.0 to 1.12.0 - [Release notes](https://github.com/libgdx/libgdx/releases) - [Changelog](https://github.com/libgdx/libgdx/blob/master/CHANGES) - [Commits](https://github.com/libgdx/libgdx/compare/1.11.0...1.12.0) Updates `com.badlogicgames.gdx:gdx` from 1.11.0 to 1.12.0 - [Release notes](https://github.com/libgdx/libgdx/releases) - [Changelog](https://github.com/libgdx/libgdx/blob/master/CHANGES) - [Commits](https://github.com/libgdx/libgdx/compare/1.11.0...1.12.0) --- updated-dependencies: - dependency-name: com.badlogicgames.gdx:gdx-backend-lwjgl3 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.badlogicgames.gdx:gdx-backend-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.badlogicgames.gdx:gdx-backend-gwt dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.badlogicgames.gdx:gdx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8dfa4fc..eaf2e9a 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { version = '1.0' ext { appName = "Halma" - gdxVersion = '1.11.0' + gdxVersion = '1.12.0' } From 1430dc472b3aab261d913a2e1d86e732c62fac37 Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Sat, 2 Sep 2023 02:20:42 +0200 Subject: [PATCH 3/6] Downgrade AGP --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index eaf2e9a..83b3869 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath 'org.wisepersist:gwt-gradle-plugin:1.1.16' classpath 'org.gretty:gretty:3.0.8' - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:7.4.2' } } From b7927c2889d59ae13981bbda970b83c8587ca360 Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Sun, 3 Sep 2023 18:59:23 +0200 Subject: [PATCH 4/6] Add Development Container --- .devcontainer/devcontainer.json | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..5766f04 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,44 @@ +// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/java +{ + "name": "Java", + "build": { + "dockerfile": "Dockerfile", + "args": { + // Update the VARIANT arg to pick a Java version: 8, 11, 17 + // Append -bullseye or -buster to pin to an OS version. + // Use the -bullseye variants on local arm64/Apple Silicon. + "VARIANT": "17-bullseye", + // Options + "INSTALL_MAVEN": "true", + "MAVEN_VERSION": "3.8.5", + "INSTALL_GRADLE": "true", + "NODE_VERSION": "lts/*" + } + }, + + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + "maven.executable.path": "/usr/local/sdkman/candidates/maven/current/bin/mvn" + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "vscjava.vscode-java-pack" + ] + } + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "java -version", + + // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode" +} From 82aa10c8698fc03abf041e17a51965a5f634a4d3 Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Sun, 3 Sep 2023 18:59:52 +0200 Subject: [PATCH 5/6] Delete .devcontainer directory Empty space at line end --- .devcontainer /devcontainer.json | 44 -------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .devcontainer /devcontainer.json diff --git a/.devcontainer /devcontainer.json b/.devcontainer /devcontainer.json deleted file mode 100644 index 5766f04..0000000 --- a/.devcontainer /devcontainer.json +++ /dev/null @@ -1,44 +0,0 @@ -// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/java -{ - "name": "Java", - "build": { - "dockerfile": "Dockerfile", - "args": { - // Update the VARIANT arg to pick a Java version: 8, 11, 17 - // Append -bullseye or -buster to pin to an OS version. - // Use the -bullseye variants on local arm64/Apple Silicon. - "VARIANT": "17-bullseye", - // Options - "INSTALL_MAVEN": "true", - "MAVEN_VERSION": "3.8.5", - "INSTALL_GRADLE": "true", - "NODE_VERSION": "lts/*" - } - }, - - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Set *default* container specific settings.json values on container create. - "settings": { - "maven.executable.path": "/usr/local/sdkman/candidates/maven/current/bin/mvn" - }, - - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "vscjava.vscode-java-pack" - ] - } - }, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "java -version", - - // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode" -} From 87aa0405d93339dd72e03f9001f4bf2a18d599e6 Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Sun, 3 Sep 2023 23:10:41 +0200 Subject: [PATCH 6/6] Enable AndroidX --- .gitignore | 3 +++ gradle.properties | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index c4c6ca1..676d108 100644 --- a/.gitignore +++ b/.gitignore @@ -106,6 +106,9 @@ gradle-app.setting /html/build/ /ios/build/ +## Keystore +*.jks + ## OS Specific .DS_Store Thumbs.db diff --git a/gradle.properties b/gradle.properties index ff329ac..f3a67c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms128m -Xmx1500m org.gradle.configureondemand=false +android.useAndroidX=true