mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2025-12-17 21:12:34 +01:00
Implement #10358: Clean up leftover references to openrct2.website
This commit is contained in:
committed by
GitHub
parent
0f306d6f5c
commit
77d18a664b
@@ -4456,7 +4456,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libxc/lib",
|
"$(PROJECT_DIR)/libxc/lib",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = website.openrct2.OpenRCT2;
|
PRODUCT_BUNDLE_IDENTIFIER = io.openrct2.OpenRCT2;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
@@ -4499,7 +4499,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libxc/lib",
|
"$(PROJECT_DIR)/libxc/lib",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = website.openrct2.OpenRCT2;
|
PRODUCT_BUNDLE_IDENTIFIER = io.openrct2.OpenRCT2;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ android {
|
|||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '29.0.2'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId 'website.openrct2'
|
applicationId 'io.openrct2'
|
||||||
minSdkVersion 19
|
minSdkVersion 19
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
"client_info": {
|
"client_info": {
|
||||||
"mobilesdk_app_id": "",
|
"mobilesdk_app_id": "",
|
||||||
"android_client_info": {
|
"android_client_info": {
|
||||||
"package_name": "website.openrct2.debug"
|
"package_name": "io.openrct2.debug"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth_client": [],
|
"oauth_client": [],
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
"client_info": {
|
"client_info": {
|
||||||
"mobilesdk_app_id": "",
|
"mobilesdk_app_id": "",
|
||||||
"android_client_info": {
|
"android_client_info": {
|
||||||
"package_name": "website.openrct2.develop"
|
"package_name": "io.openrct2.develop"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth_client": [],
|
"oauth_client": [],
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
"client_info": {
|
"client_info": {
|
||||||
"mobilesdk_app_id": "",
|
"mobilesdk_app_id": "",
|
||||||
"android_client_info": {
|
"android_client_info": {
|
||||||
"package_name": "website.openrct2"
|
"package_name": "io.openrct2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth_client": [],
|
"oauth_client": [],
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="website.openrct2">
|
package="io.openrct2">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package website.openrct2;
|
package io.openrct2;
|
||||||
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package website.openrct2;
|
package io.openrct2;
|
||||||
|
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package website.openrct2;
|
package io.openrct2;
|
||||||
|
|
||||||
import android.Manifest;
|
import android.Manifest;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package website.openrct2;
|
package io.openrct2;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package website.openrct2;
|
package io.openrct2;
|
||||||
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ public:
|
|||||||
// retrieve the JNI environment.
|
// retrieve the JNI environment.
|
||||||
JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
|
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, "<init>", "(Ljava/lang/String;)V");
|
jmethodID constructor = env->GetMethodID(jniClass, "<init>", "(Ljava/lang/String;)V");
|
||||||
|
|
||||||
jstring jniPath = env->NewStringUTF(path.data());
|
jstring jniPath = env->NewStringUTF(path.data());
|
||||||
@@ -151,10 +151,10 @@ namespace Zip
|
|||||||
} // namespace Zip
|
} // namespace Zip
|
||||||
|
|
||||||
extern "C" {
|
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);
|
jbyte* bufferPtr = env->GetByteArrayElements(input, nullptr);
|
||||||
|
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ AndroidClassLoader::AndroidClassLoader()
|
|||||||
// Take an arbitrary class. While the class does not really matter, it
|
// 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
|
// makes sense to use one that's most likely already loaded and is unlikely
|
||||||
// to be removed from code.
|
// to be removed from code.
|
||||||
auto randomClass = env->FindClass("website/openrct2/MainActivity");
|
auto randomClass = env->FindClass("io/openrct2/MainActivity");
|
||||||
jclass classClass = env->GetObjectClass(randomClass);
|
jclass classClass = env->GetObjectClass(randomClass);
|
||||||
|
|
||||||
// Get its class loader
|
// Get its class loader
|
||||||
|
|||||||
Reference in New Issue
Block a user