diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index a5804139d8..b79d120030 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -4456,7 +4456,7 @@ "$(inherited)", "$(PROJECT_DIR)/libxc/lib", ); - PRODUCT_BUNDLE_IDENTIFIER = website.openrct2.OpenRCT2; + PRODUCT_BUNDLE_IDENTIFIER = io.openrct2.OpenRCT2; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4499,7 +4499,7 @@ "$(inherited)", "$(PROJECT_DIR)/libxc/lib", ); - PRODUCT_BUNDLE_IDENTIFIER = website.openrct2.OpenRCT2; + PRODUCT_BUNDLE_IDENTIFIER = io.openrct2.OpenRCT2; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle index 4c372fa370..a3c2088f43 100644 --- a/src/openrct2-android/app/build.gradle +++ b/src/openrct2-android/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion '29.0.2' defaultConfig { - applicationId 'website.openrct2' + applicationId 'io.openrct2' minSdkVersion 19 targetSdkVersion 29 diff --git a/src/openrct2-android/app/google-services.json b/src/openrct2-android/app/google-services.json index 6c7906a29a..9cda2265aa 100644 --- a/src/openrct2-android/app/google-services.json +++ b/src/openrct2-android/app/google-services.json @@ -8,7 +8,7 @@ "client_info": { "mobilesdk_app_id": "", "android_client_info": { - "package_name": "website.openrct2.debug" + "package_name": "io.openrct2.debug" } }, "oauth_client": [], @@ -37,7 +37,7 @@ "client_info": { "mobilesdk_app_id": "", "android_client_info": { - "package_name": "website.openrct2.develop" + "package_name": "io.openrct2.develop" } }, "oauth_client": [], @@ -66,7 +66,7 @@ "client_info": { "mobilesdk_app_id": "", "android_client_info": { - "package_name": "website.openrct2" + "package_name": "io.openrct2" } }, "oauth_client": [], diff --git a/src/openrct2-android/app/src/main/AndroidManifest.xml b/src/openrct2-android/app/src/main/AndroidManifest.xml index 07a637b0d8..4c388c10f3 100644 --- a/src/openrct2-android/app/src/main/AndroidManifest.xml +++ b/src/openrct2-android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="io.openrct2"> diff --git a/src/openrct2-android/app/src/main/java/website/openrct2/GameActivity.java b/src/openrct2-android/app/src/main/java/io/openrct2/GameActivity.java similarity index 98% rename from src/openrct2-android/app/src/main/java/website/openrct2/GameActivity.java rename to src/openrct2-android/app/src/main/java/io/openrct2/GameActivity.java index 80baac0535..31334ca761 100644 --- a/src/openrct2-android/app/src/main/java/website/openrct2/GameActivity.java +++ b/src/openrct2-android/app/src/main/java/io/openrct2/GameActivity.java @@ -1,4 +1,4 @@ -package website.openrct2; +package io.openrct2; import android.view.View; diff --git a/src/openrct2-android/app/src/main/java/website/openrct2/Localisation.java b/src/openrct2-android/app/src/main/java/io/openrct2/Localisation.java similarity index 93% rename from src/openrct2-android/app/src/main/java/website/openrct2/Localisation.java rename to src/openrct2-android/app/src/main/java/io/openrct2/Localisation.java index f25e3e2317..c7b288f4fe 100644 --- a/src/openrct2-android/app/src/main/java/website/openrct2/Localisation.java +++ b/src/openrct2-android/app/src/main/java/io/openrct2/Localisation.java @@ -1,4 +1,4 @@ -package website.openrct2; +package io.openrct2; import java.io.UnsupportedEncodingException; diff --git a/src/openrct2-android/app/src/main/java/website/openrct2/MainActivity.java b/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java similarity index 99% rename from src/openrct2-android/app/src/main/java/website/openrct2/MainActivity.java rename to src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java index 89c7916f8c..e9b8065c34 100644 --- a/src/openrct2-android/app/src/main/java/website/openrct2/MainActivity.java +++ b/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java @@ -1,4 +1,4 @@ -package website.openrct2; +package io.openrct2; import android.Manifest; import android.content.Intent; diff --git a/src/openrct2-android/app/src/main/java/website/openrct2/OpenRCT2App.java b/src/openrct2-android/app/src/main/java/io/openrct2/OpenRCT2App.java similarity index 96% rename from src/openrct2-android/app/src/main/java/website/openrct2/OpenRCT2App.java rename to src/openrct2-android/app/src/main/java/io/openrct2/OpenRCT2App.java index 066601ae8f..4702a4d143 100644 --- a/src/openrct2-android/app/src/main/java/website/openrct2/OpenRCT2App.java +++ b/src/openrct2-android/app/src/main/java/io/openrct2/OpenRCT2App.java @@ -1,4 +1,4 @@ -package website.openrct2; +package io.openrct2; import android.app.Application; diff --git a/src/openrct2-android/app/src/main/java/website/openrct2/ZipArchive.java b/src/openrct2-android/app/src/main/java/io/openrct2/ZipArchive.java similarity index 98% rename from src/openrct2-android/app/src/main/java/website/openrct2/ZipArchive.java rename to src/openrct2-android/app/src/main/java/io/openrct2/ZipArchive.java index a1e575c3ae..5450fa1c63 100644 --- a/src/openrct2-android/app/src/main/java/website/openrct2/ZipArchive.java +++ b/src/openrct2-android/app/src/main/java/io/openrct2/ZipArchive.java @@ -1,4 +1,4 @@ -package website.openrct2; +package io.openrct2; import android.util.Log; diff --git a/src/openrct2/core/ZipAndroid.cpp b/src/openrct2/core/ZipAndroid.cpp index 714a918bf2..3625a40b58 100644 --- a/src/openrct2/core/ZipAndroid.cpp +++ b/src/openrct2/core/ZipAndroid.cpp @@ -27,7 +27,7 @@ public: // retrieve the JNI environment. JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv(); - jclass jniClass = platform_android_find_class(env, "website/openrct2/ZipArchive"); + jclass jniClass = platform_android_find_class(env, "io/openrct2/ZipArchive"); jmethodID constructor = env->GetMethodID(jniClass, "", "(Ljava/lang/String;)V"); jstring jniPath = env->NewStringUTF(path.data()); @@ -151,10 +151,10 @@ namespace Zip } // namespace Zip extern "C" { -JNIEXPORT jlong JNICALL Java_website_openrct2_ZipArchive_allocBytes(JNIEnv* env, jclass, jbyteArray input, jint numBytes); +JNIEXPORT jlong JNICALL Java_io_openrct2_ZipArchive_allocBytes(JNIEnv* env, jclass, jbyteArray input, jint numBytes); } -JNIEXPORT jlong JNICALL Java_website_openrct2_ZipArchive_allocBytes(JNIEnv* env, jclass, jbyteArray input, jint numBytes) +JNIEXPORT jlong JNICALL Java_io_openrct2_ZipArchive_allocBytes(JNIEnv* env, jclass, jbyteArray input, jint numBytes) { jbyte* bufferPtr = env->GetByteArrayElements(input, nullptr); diff --git a/src/openrct2/platform/Android.cpp b/src/openrct2/platform/Android.cpp index b88f782e48..4ead02c572 100644 --- a/src/openrct2/platform/Android.cpp +++ b/src/openrct2/platform/Android.cpp @@ -85,7 +85,7 @@ AndroidClassLoader::AndroidClassLoader() // Take an arbitrary class. While the class does not really matter, it // makes sense to use one that's most likely already loaded and is unlikely // to be removed from code. - auto randomClass = env->FindClass("website/openrct2/MainActivity"); + auto randomClass = env->FindClass("io/openrct2/MainActivity"); jclass classClass = env->GetObjectClass(randomClass); // Get its class loader