From 5d6497db138e6cb1cb06dcde83ec7f0d55941623 Mon Sep 17 00:00:00 2001 From: Alexis He Date: Fri, 20 Aug 2021 08:07:40 +0200 Subject: [PATCH] Change: update pelya repository target commit, remove android patch --- ...-patch-simutrans-122.0-compatibility.patch | 35 ------------------- .github/workflows/nightly-android.yml | 6 ++-- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 .github/android/0001-ADD-patch-simutrans-122.0-compatibility.patch diff --git a/.github/android/0001-ADD-patch-simutrans-122.0-compatibility.patch b/.github/android/0001-ADD-patch-simutrans-122.0-compatibility.patch deleted file mode 100644 index 0e60ac03e..000000000 --- a/.github/android/0001-ADD-patch-simutrans-122.0-compatibility.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/project/jni/application/simutrans/AndroidAppSettings.cfg b/project/jni/application/simutrans/AndroidAppSettings.cfg -index 3dbf10872..f31dfa8b2 100644 ---- a/project/jni/application/simutrans/AndroidAppSettings.cfg -+++ b/project/jni/application/simutrans/AndroidAppSettings.cfg -@@ -7,10 +7,10 @@ AppName="Simutrans" - AppFullName=com.simutrans - - # Application version code (integer) --AppVersionCode=1210 -+AppVersionCode=1220 - - # Application user-visible version name (string) --AppVersionName="121.0" -+AppVersionName="122.0" - - # Specify path to download application data in zip archive in the form "Description|URL|MirrorURL^Description2|URL2|MirrorURL2^..." - # If you'll start Description with '!' symbol it will be enabled by default, '!!' will also hide the entry from the menu, so it cannot be disabled -@@ -74,7 +74,7 @@ UseGl4es= - SwVideoMode=y - - # Application video output will be resized to fit into native device screen (y)/(n) --SdlVideoResize=n -+SdlVideoResize=y - - # Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n) - SdlVideoResizeKeepAspect=n -@@ -314,7 +314,7 @@ AppSubdirsBuild='' - AppBuildExclude='' - - # Application command line parameters, including app name as 0-th param --AppCmdline='simutrans -use_workdir -screensize 800x600 -fullscreen' -+AppCmdline='simutrans -use_workdir -screensize 800x480 -fullscreen' - - # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens - # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/.github/workflows/nightly-android.yml b/.github/workflows/nightly-android.yml index 8b4ff29eb..bfbd92916 100644 --- a/.github/workflows/nightly-android.yml +++ b/.github/workflows/nightly-android.yml @@ -78,7 +78,7 @@ jobs: - name: Checkout lib Android SDL by pelya (hard coded version) working-directory: /android-sdl run: | - git init && git remote add origin https://github.com/pelya/commandergenius.git && git fetch origin c470f348c4d7afdbdffce4cfebe5265bd798f699 && git reset --hard FETCH_HEAD + git init && git remote add origin https://github.com/pelya/commandergenius.git && git fetch origin 22e2154d7e0105a06b067751c2f7ab4c134a9f1b && git reset --hard FETCH_HEAD - name: Setup licenses for Gradle working-directory: /android-sdl @@ -104,8 +104,8 @@ jobs: - name: (Temporary) Patch Android SDL and replace version working-directory: /android-sdl run: | - cp -r $GITHUB_WORKSPACE/.github/android/*.patch . - git apply *.patch + if [ -f $GITHUB_WORKSPACE/.github/android/*.patch ]; then cp -r $GITHUB_WORKSPACE/.github/android/*.patch .; fi; + if [ -f *.patch ]; then git apply *.patch; fi; sed -i "s/^AppVersionCode=[0-9]\+/AppVersionCode=$(svnversion project/jni/application/simutrans/simutrans)/" ./project/jni/application/simutrans/AndroidAppSettings.cfg sed -i "s/^AppVersionName=\"[0-9]\+.[0-9]\+\"/AppVersionName=\"r$(svnversion project/jni/application/simutrans/simutrans)\"/" ./project/jni/application/simutrans/AndroidAppSettings.cfg -- 2.28.0.windows.1