Disable encrypted DependencyInfoBlock in APK build

https://gitlab.com/fdroid/fdroiddata/-/issues/3330

app/android/client/build.gradle

@@ -10,13 +10,21 @@ android {
 		applicationId namespace
 		minSdk 21
 		targetSdk 32
-		versionCode 1047005
-		versionName "1.47.5"
+		versionCode 1048000
+		versionName "1.48"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		targetSdkVersion 32
 		minSdkVersion 21
 	}
 
+	// F-Droid doesn't allow encrypted DependencyInfoBlock in APK
+	dependenciesInfo {
+		// disables dependency metadata when building APKs
+		includeInApk = false
+		// disables dependency metadata when building Android App Bundles
+		includeInBundle = false
+	}
+
 	// build output
 	project.setProperty("archivesBaseName", "${namespace}-${defaultConfig.versionCode}")
 	project.setProperty("buildDir", "${projectDir}/../../../build/build_android_client")

app/android/client/src/main/play/release-notes/en-US/default.txt

@@ -1,9 +1,7 @@
-Pizza is a popular meal of choice. With growing demand, Leander is looking to hire reliable workers to transport his hot and delicious cuisine to patrons. Couriers with reputations of on-time deliveries are being recognized for their work ethic.
+The world has just gotten a little fancier. You may notice that the clouds have cleared in Kikareukin, revealing a beautiful view of Semos below.
 
-Some adventurers may be distressed and feel that their quest for the title of "Ultimate Collector" is in vain. Well fret no more, as Balduin is offering a ray of hope. Requests to bring him a different item are now accepted afer some time has passed.
+If luck has it, you may find a rare four-leaf clover. Keep your eyes peeled, they pop up in random locations that receive sunshine. Clover hunters will reward generously for such valuable trinkets.
 
-Speaking of weapons, some creatures have once again taken up arms. For example the angel and dark angel have new swords.
+Jef is still eager to hear from his mother, Amber. But don't expect to find her on her usual route as she has taken to wandering off the beaten path. Speaking of wandering, some creatures have become more unpredictable in their behavior. Be careful, as you may encounter them in unexpected places.
 
-Last but not least: We released an official Android App, which is available in the download section of our website or on F-Droid.
-
-Please see the complete change log for further details: http://localhost/game/stendhal.html#changes
+Please see the complete change log for further details: https://arianne-project.org/game/stendhal.html#changes

app/android/client/src/main/res/values/strings.xml

@@ -5,6 +5,6 @@
 	<string name="app_name">Stendhal</string>
 	<string name="intent_url_scheme">stendhalprod8gps5y99pu</string>
 	<string name="build_type">prod</string>
-	<string name="build_version">1.47.5</string>
+	<string name="build_version">1.48</string>
 
 </resources>

app/neutralinojs/neutralino.config.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/neutralinojs/neutralinojs/main/schemas/neutralino.config.schema.json",
   "applicationId": "org.stendhalgame.client",
-  "version": "1.47.5",
+  "version": "1.48",
   "defaultMode": "window",
   "port": 0,
   "documentRoot": "/resources/",

bin/runserver.bat

@@ -1,6 +1,6 @@
 @echo off
 
-set STENDHAL_VERSION=1.47.5
+set STENDHAL_VERSION=1.48
 set SERVER_JAR=stendhal-server-%STENDHAL_VERSION%.jar
 
 :: change to server directory

bin/runserver.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-STENDHAL_VERSION="1.47.5"
+STENDHAL_VERSION="1.48"
 SERVER_JAR="stendhal-server-${STENDHAL_VERSION}.jar"
 
 # change to server directory

build.ant.properties

@@ -92,9 +92,9 @@ version_server          = http://arianne.sourceforge.net/stendhal.version
 
 # current version of stendhal
 version.old = 1.47
-version     = 1.47.5
+version     = 1.48
+version.android = 1048000
 # FIXME: dynamic method to set this property?
-version.android = 1047005
 
 # javac options
 javac.deprecation = true

buildtools/mkdocs/mkdocs.yml

@@ -1,4 +1,4 @@
-site_name: Stendhal 1.47.5 Reference Documentation
+site_name: Stendhal 1.48 Reference Documentation
 site_description: A fun, friendly, & free multiplayer online adventure game.
 copyright: Copyright © 2003-2024 Stendhal
 site_url: https://stendhalgame.org/

src/games/stendhal/common/Debug.java

@@ -26,7 +26,7 @@ public class Debug {
 
 	/** version. */
 	// Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line.
-	public static final String VERSION = "1.47.5";
+	public static final String VERSION = "1.48";
 
 	/** pre release suffix */
 	// Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line.

src/games/stendhal/server/entity/creature/impl/idle/IdleBehaviourFactory.java

@@ -32,15 +32,14 @@ public class IdleBehaviourFactory {
 			} else {
 				behaviour = new WanderIdleBehaviour();
 			}
-		} else if (aiProfiles.containsKey("patrolling") && aiProfiles.containsKey("wander")) {
-			// randomly select between "patrolling" & "wander" for individual entity instance
-			behaviour = Rand.flipCoin() ? new Patroller() : behaviour;
+			if (aiProfiles.containsKey("patrolling")) {
+				// randomly select between "patrolling" & "wander" for individual entity instance
+				behaviour = Rand.flipCoin() ? new Patroller() : behaviour;
+			}
 		} else if (aiProfiles.containsKey("patrolling")) {
 			behaviour = new Patroller();
 		} else if (aiProfiles.containsKey("camouflage")) {
 			behaviour = new CamouflagedIdleBehaviour();
-		} else if (aiProfiles.containsKey("wander")) {
-			behaviour = new WanderIdleBehaviour();
 		}
 		return behaviour;
 	}