Regression: Fix Android external dependencies

misc/dist/linux/org.redotengine.Redot.appdata.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017-2022 Rémi Verschelde <remi@godotengine.org> -->
 <component type="desktop">
-  <id>org.redotengine.Redot</id>
+  <id>org.godotengine.Redot</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>MIT</project_license>
   <name>Redot Engine</name>
   <summary>Multi-platform 2D and 3D game engine with a feature-rich editor</summary>
-  <launchable type="desktop-id">org.redotengine.Redot.desktop</launchable>
+  <launchable type="desktop-id">org.godotengine.Redot.desktop</launchable>
   <description>
     <p>
       Redot is forked from Godot which is an advanced, feature-packed, multi-platform 2D and 3D game

misc/dist/macos/editor_info_plist.template

@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Redot.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.redotengine.redot</string>
+	<string>org.godotengine.redot</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

misc/dist/macos_tools.app/Contents/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Redot.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.redotengine.redot</string>
+	<string>org.godotengine.redot</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

modules/text_server_adv/gdextension_build/SConstruct

@@ -748,7 +748,7 @@ if env["platform"] == "macos":
     methods.write_macos_plist(
         f"./bin/libtextserver_advanced.macos.{env['target']}.framework",
         f"libtextserver_advanced.macos.{env['target']}",
-        "org.redotengine.textserver_advanced",
+        "org.godotengine.textserver_advanced",
         "ICU / HarfBuzz / Graphite Text Server",
     )
     library = env.SharedLibrary(

modules/text_server_fb/gdextension_build/SConstruct

@@ -293,7 +293,7 @@ if env["platform"] == "macos":
     methods.write_macos_plist(
         f"./bin/libtextserver_fallback.macos.{env['target']}.framework",
         f"libtextserver_fallback.macos.{env['target']}",
-        "org.redotengine.textserver_fallback",
+        "org.godotengine.textserver_fallback",
         "Fallback Text Server",
     )
     library = env.SharedLibrary(

platform/android/dialog_utils_jni.cpp

@@ -37,14 +37,14 @@
 
 extern "C" {
 
-JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index) {
 	DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton();
 	if (ds) {
 		ds->emit_dialog_callback(p_button_index);
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text) {
 	DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton();
 	if (ds) {
 		String text = jstring_to_string(p_text, env);

platform/android/dialog_utils_jni.h

@@ -36,8 +36,8 @@
 #include <jni.h>
 
 extern "C" {
-JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index);
-JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text);
 }
 
 #endif // DIALOG_UTILS_JNI_H

platform/android/java/app/AndroidManifest.xml

@@ -31,7 +31,7 @@
 
         <!-- Records the version of the Godot editor used for building -->
         <meta-data
-            android:name="org.redotengine.editor.version"
+            android:name="org.godotengine.editor.version"
             android:value="${godotEditorVersion}" />
         <!-- Records the rendering method used by the Godot engine -->
         <meta-data

platform/android/java/app/src/com/godot/game/GodotApp.java

@@ -32,13 +32,14 @@
 
 package com.godot.game;
 
+import org.godotengine.godot.GodotActivity;
+
 import android.os.Bundle;
 import android.util.Log;
 
 import androidx.core.splashscreen.SplashScreen;
 
 import com.godot.game.BuildConfig;
-import org.redotengine.godot.GodotActivity;
 
 /**
  * Template activity for Godot Android builds.

platform/android/java/editor/build.gradle

@@ -74,11 +74,11 @@ android {
     buildToolsVersion versions.buildTools
     ndkVersion versions.ndkVersion
 
-    namespace = "org.redotengine.editor"
+    namespace = "org.godotengine.editor"
 
     defaultConfig {
         // The 'applicationId' suffix allows to install Redot 3.x(v3) and 4.x(v4) on the same device
-        applicationId "org.redotengine.editor.v4"
+        applicationId "org.godotengine.editor.v4"
         versionCode generateVersionCode()
         versionName generateVersionName()
         minSdkVersion versions.minSdk

platform/android/java/editor/src/android/java/org/godotengine/editor/GodotEditor.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 /**
  * Primary window of the Godot Editor.

platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 /**
  * Primary window of the Godot Editor.

platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 import android.Manifest
 import android.app.ActivityManager
@@ -51,21 +51,21 @@ import androidx.core.content.edit
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.isVisible
 import androidx.window.layout.WindowMetricsCalculator
-import org.redotengine.editor.embed.EmbeddedGodotGame
-import org.redotengine.editor.embed.GameMenuFragment
-import org.redotengine.editor.utils.signApk
-import org.redotengine.editor.utils.verifyApk
-import org.redotengine.godot.BuildConfig
-import org.redotengine.godot.GodotActivity
-import org.redotengine.godot.GodotLib
-import org.redotengine.godot.error.Error
-import org.redotengine.godot.utils.DialogUtils
-import org.redotengine.godot.utils.GameMenuUtils
-import org.redotengine.godot.utils.GameMenuUtils.GameEmbedMode
-import org.redotengine.godot.utils.GameMenuUtils.fetchGameEmbedMode
-import org.redotengine.godot.utils.PermissionsUtil
-import org.redotengine.godot.utils.ProcessPhoenix
-import org.redotengine.godot.utils.isNativeXRDevice
+import org.godotengine.editor.embed.EmbeddedGodotGame
+import org.godotengine.editor.embed.GameMenuFragment
+import org.godotengine.editor.utils.signApk
+import org.godotengine.editor.utils.verifyApk
+import org.godotengine.godot.BuildConfig
+import org.godotengine.godot.GodotActivity
+import org.godotengine.godot.GodotLib
+import org.godotengine.godot.error.Error
+import org.godotengine.godot.utils.DialogUtils
+import org.godotengine.godot.utils.GameMenuUtils
+import org.godotengine.godot.utils.GameMenuUtils.GameEmbedMode
+import org.godotengine.godot.utils.GameMenuUtils.fetchGameEmbedMode
+import org.godotengine.godot.utils.PermissionsUtil
+import org.godotengine.godot.utils.ProcessPhoenix
+import org.godotengine.godot.utils.isNativeXRDevice
 import kotlin.math.min
 
 /**

platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotGame.kt

@@ -30,15 +30,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 import android.Manifest
 import android.util.Log
 import androidx.annotation.CallSuper
-import org.redotengine.godot.GodotLib
-import org.redotengine.godot.utils.GameMenuUtils
-import org.redotengine.godot.utils.PermissionsUtil
-import org.redotengine.godot.utils.ProcessPhoenix
+import org.godotengine.godot.GodotLib
+import org.godotengine.godot.utils.GameMenuUtils
+import org.godotengine.godot.utils.PermissionsUtil
+import org.godotengine.godot.utils.ProcessPhoenix
 
 /**
  * Base class for the Godot play windows.

platform/android/java/editor/src/main/java/org/godotengine/editor/EditorMessageDispatcher.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 import android.annotation.SuppressLint
 import android.content.Intent

platform/android/java/editor/src/main/java/org/godotengine/editor/EditorWindowInfo.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 /**
  * Specifies the policy for launches.

platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 import android.app.PictureInPictureParams
 import android.content.pm.PackageManager
@@ -40,10 +40,10 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.core.view.isVisible
-import org.redotengine.editor.embed.GameMenuFragment
-import org.redotengine.godot.utils.GameMenuUtils
-import org.redotengine.godot.utils.ProcessPhoenix
-import org.redotengine.godot.utils.isNativeXRDevice
+import org.godotengine.editor.embed.GameMenuFragment
+import org.godotengine.godot.utils.GameMenuUtils
+import org.godotengine.godot.utils.ProcessPhoenix
+import org.godotengine.godot.utils.isNativeXRDevice
 
 /**
  * Drives the 'run project' window of the Godot Editor.

platform/android/java/editor/src/main/java/org/godotengine/editor/GodotXRGame.kt

@@ -30,10 +30,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
-import org.redotengine.godot.GodotLib
-import org.redotengine.godot.xr.XRMode
+import org.godotengine.godot.GodotLib
+import org.godotengine.godot.xr.XRMode
 
 /**
  * Provide support for running XR apps / games from the editor window.

platform/android/java/editor/src/main/java/org/godotengine/editor/embed/EmbeddedGodotGame.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor.embed
+package org.godotengine.editor.embed
 
 import android.content.pm.ActivityInfo
 import android.os.Bundle
@@ -40,9 +40,9 @@ import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND
 import android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
 import android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
-import org.redotengine.editor.GodotGame
-import org.redotengine.editor.R
-import org.redotengine.godot.utils.GameMenuUtils
+import org.godotengine.editor.GodotGame
+import org.godotengine.editor.R
+import org.godotengine.godot.utils.GameMenuUtils
 
 /**
  * Host the Godot game from the editor when the embedded mode is enabled.

platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor.embed
+package org.godotengine.editor.embed
 
 import android.content.Context
 import android.os.Build
@@ -45,10 +45,10 @@ import android.widget.RadioButton
 import androidx.core.content.edit
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import org.redotengine.editor.BaseGodotEditor
-import org.redotengine.editor.BaseGodotEditor.Companion.SNACKBAR_SHOW_DURATION_MS
-import org.redotengine.editor.R
-import org.redotengine.godot.utils.DialogUtils
+import org.godotengine.editor.BaseGodotEditor
+import org.godotengine.editor.BaseGodotEditor.Companion.SNACKBAR_SHOW_DURATION_MS
+import org.godotengine.editor.R
+import org.godotengine.godot.utils.DialogUtils
 
 /**
  * Implements the game menu interface for the Android editor.

platform/android/java/editor/src/main/java/org/godotengine/editor/utils/ApkSignerUtil.kt

@@ -32,14 +32,14 @@
 
 @file:JvmName("ApkSignerUtil")
 
-package org.redotengine.editor.utils
+package org.godotengine.editor.utils
 
 import android.util.Log
 import com.android.apksig.ApkSigner
 import com.android.apksig.ApkVerifier
 import org.bouncycastle.jce.provider.BouncyCastleProvider
-import org.redotengine.godot.error.Error
-import org.redotengine.godot.io.file.FileAccessHandler
+import org.godotengine.godot.error.Error
+import org.godotengine.godot.io.file.FileAccessHandler
 import java.io.File
 import java.security.KeyStore
 import java.security.PrivateKey

platform/android/java/editor/src/picoos/java/org/godotengine/editor/GodotEditor.kt

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.redotengine.editor
+package org.godotengine.editor
 
 /**
  * Primary window of the Godot Editor.

platform/android/java/lib/AndroidManifest.xml

@@ -7,7 +7,7 @@
 
         <!-- Records the version of the Godot library -->
         <meta-data
-            android:name="org.redotengine.library.version"
+            android:name="org.godotengine.library.version"
             android:value="${godotLibraryVersion}" />
 
         <service android:name=".GodotDownloaderService" />

platform/android/java/lib/build.gradle

@@ -29,7 +29,7 @@ android {
         manifestPlaceholders = [godotLibraryVersion: getGodotLibraryVersionName()]
     }
 
-    namespace = "org.redotengine.godot"
+    namespace = "org.godotengine.godot"
 
     compileOptions {
         sourceCompatibility versions.javaVersion

platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch

@@ -175,7 +175,7 @@ index e4b1b0f1c..36cd6aacf 100644
 -import com.android.vending.expansion.downloader.R;
 +// -- GODOT start --
 +//import com.android.vending.expansion.downloader.R;
-+import org.redotengine.godot.R;
++import org.godotengine.godot.R;
 +// -- GODOT end --
 
  import java.io.File;
@@ -250,7 +250,7 @@ index f1536e80e..4b214b22d 100644
 -import com.android.vending.expansion.downloader.R;
 +// -- GODOT start --
 +//import com.android.vending.expansion.downloader.R;
-+import org.redotengine.godot.R;
++import org.godotengine.godot.R;
 +// -- GODOT end --
 +
  import com.google.android.vending.expansion.downloader.DownloadProgressInfo;

platform/android/java/lib/patches/com.google.android.vending.licensing.patch

@@ -21,7 +21,7 @@ index a0d2779af..a8bf65f9c 100644
   */
 
 +// -- GODOT start --
-import org.redotengine.godot.BuildConfig;
+import org.godotengine.godot.BuildConfig;
 +// -- GODOT end --
 +
  /**

platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java

@@ -26,7 +26,7 @@
 
 // -- GODOT start --
 //import com.android.vending.expansion.downloader.R;
-import org.redotengine.godot.R;
+import org.godotengine.godot.R;
 // -- GODOT end --
 
 import java.io.File;

platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java

@@ -18,7 +18,7 @@
 
 // -- GODOT start --
 //import com.android.vending.expansion.downloader.R;
-import org.redotengine.godot.R;
+import org.godotengine.godot.R;
 // -- GODOT end --
 
 import com.google.android.vending.expansion.downloader.DownloadProgressInfo;