diff --git a/Modules/@babylonjs/react-native/android/build.gradle b/Modules/@babylonjs/react-native/android/build.gradle index 15b7cb23e..9c5657794 100644 --- a/Modules/@babylonjs/react-native/android/build.gradle +++ b/Modules/@babylonjs/react-native/android/build.gradle @@ -125,7 +125,7 @@ def configureReactNativePom(def pom) { name packageJson.title artifactId packageJson.name version = packageJson.version - group = "com.reactlibrary" + group = "com.babylonreactnative" description packageJson.description url packageJson.repository.baseUrl diff --git a/Modules/@babylonjs/react-native/android/src/main/AndroidManifest.xml b/Modules/@babylonjs/react-native/android/src/main/AndroidManifest.xml index 20c90c41e..a98668555 100644 --- a/Modules/@babylonjs/react-native/android/src/main/AndroidManifest.xml +++ b/Modules/@babylonjs/react-native/android/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="com.babylonreactnative"> diff --git a/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp b/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp index 69e86db30..6f30571d7 100644 --- a/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp +++ b/Modules/@babylonjs/react-native/android/src/main/cpp/BabylonNativeInterop.cpp @@ -102,7 +102,7 @@ namespace Babylon }; } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_initialize(JNIEnv* env, jclass obj, jobject context) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_initialize(JNIEnv* env, jclass obj, jobject context) { JavaVM* javaVM{}; if (env->GetJavaVM(&javaVM) != JNI_OK) @@ -113,22 +113,22 @@ extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_ini android::global::Initialize(javaVM, context); } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_setCurrentActivity(JNIEnv* env, jclass obj, jobject activity) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_setCurrentActivity(JNIEnv* env, jclass obj, jobject activity) { android::global::SetCurrentActivity(activity); } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_pause(JNIEnv* env, jclass obj) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_pause(JNIEnv* env, jclass obj) { android::global::Pause(); } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_resume(JNIEnv* env, jclass obj) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_resume(JNIEnv* env, jclass obj) { android::global::Resume(); } -extern "C" JNIEXPORT jlong JNICALL Java_com_reactlibrary_BabylonNativeInterop_create(JNIEnv* env, jclass obj, jlong jsiRuntimeRef, jobject jsCallInvokerHolder, jobject surface) +extern "C" JNIEXPORT jlong JNICALL Java_com_babylonreactnative_BabylonNativeInterop_create(JNIEnv* env, jclass obj, jlong jsiRuntimeRef, jobject jsCallInvokerHolder, jobject surface) { auto jsiRuntime = reinterpret_cast(jsiRuntimeRef); auto callInvoker = jni::alias_ref {reinterpret_cast(jsCallInvokerHolder)}->cthis()->getCallInvoker(); @@ -137,26 +137,26 @@ extern "C" JNIEXPORT jlong JNICALL Java_com_reactlibrary_BabylonNativeInterop_cr return reinterpret_cast(native); } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_refresh(JNIEnv* env, jclass obj, jlong instanceRef, jobject surface) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_refresh(JNIEnv* env, jclass obj, jlong instanceRef, jobject surface) { auto native = reinterpret_cast(instanceRef); ANativeWindow* windowPtr = ANativeWindow_fromSurface(env, surface); native->Refresh(windowPtr); } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_setPointerButtonState(JNIEnv* env, jclass obj, jlong instanceRef, jint pointerId, jint buttonId, jboolean isDown, jint x, jint y) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_setPointerButtonState(JNIEnv* env, jclass obj, jlong instanceRef, jint pointerId, jint buttonId, jboolean isDown, jint x, jint y) { auto native = reinterpret_cast(instanceRef); native->SetPointerButtonState(static_cast(pointerId), static_cast(buttonId), isDown, static_cast(x), static_cast(y)); } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_setPointerPosition(JNIEnv* env, jclass obj, jlong instanceRef, jint pointerId, jint x, jint y) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_setPointerPosition(JNIEnv* env, jclass obj, jlong instanceRef, jint pointerId, jint x, jint y) { auto native = reinterpret_cast(instanceRef); native->SetPointerPosition(static_cast(pointerId), static_cast(x), static_cast(y)); } -extern "C" JNIEXPORT void JNICALL Java_com_reactlibrary_BabylonNativeInterop_destroy(JNIEnv* env, jclass obj, jlong instanceRef) +extern "C" JNIEXPORT void JNICALL Java_com_babylonreactnative_BabylonNativeInterop_destroy(JNIEnv* env, jclass obj, jlong instanceRef) { auto native = reinterpret_cast(instanceRef); delete native; diff --git a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonModule.java b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonModule.java similarity index 97% rename from Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonModule.java rename to Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonModule.java index 0ea4bdd79..466e675e0 100644 --- a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonModule.java +++ b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonModule.java @@ -1,4 +1,4 @@ -package com.reactlibrary; +package com.babylonreactnative; import android.os.Handler; import android.os.Looper; diff --git a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonNativeInterop.java b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonNativeInterop.java similarity index 99% rename from Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonNativeInterop.java rename to Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonNativeInterop.java index 5b65c4858..3b6a7c40d 100644 --- a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonNativeInterop.java +++ b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonNativeInterop.java @@ -1,4 +1,4 @@ -package com.reactlibrary; +package com.babylonreactnative; import android.app.Activity; import android.content.Context; diff --git a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonPackage.java b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonPackage.java similarity index 95% rename from Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonPackage.java rename to Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonPackage.java index 63e8885ce..d5d533949 100644 --- a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/BabylonPackage.java +++ b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/BabylonPackage.java @@ -1,4 +1,4 @@ -package com.reactlibrary; +package com.babylonreactnative; import java.util.Arrays; import java.util.List; diff --git a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/EngineView.java b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/EngineView.java similarity index 99% rename from Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/EngineView.java rename to Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/EngineView.java index a73e5ef61..d3bccab57 100644 --- a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/EngineView.java +++ b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/EngineView.java @@ -1,4 +1,4 @@ -package com.reactlibrary; +package com.babylonreactnative; import android.annotation.TargetApi; import android.graphics.Bitmap; diff --git a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/EngineViewManager.java b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/EngineViewManager.java similarity index 98% rename from Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/EngineViewManager.java rename to Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/EngineViewManager.java index c6add1ade..1bfcdbcdd 100644 --- a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/EngineViewManager.java +++ b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/EngineViewManager.java @@ -1,4 +1,4 @@ -package com.reactlibrary; +package com.babylonreactnative; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/SnapshotDataReturnedEvent.java b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/SnapshotDataReturnedEvent.java similarity index 96% rename from Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/SnapshotDataReturnedEvent.java rename to Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/SnapshotDataReturnedEvent.java index 328727d2b..77a9d4088 100644 --- a/Modules/@babylonjs/react-native/android/src/main/java/com/reactlibrary/SnapshotDataReturnedEvent.java +++ b/Modules/@babylonjs/react-native/android/src/main/java/com/babylonreactnative/SnapshotDataReturnedEvent.java @@ -1,4 +1,4 @@ -package com.reactlibrary; +package com.babylonreactnative; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.WritableMap; diff --git a/Package/Android/build.gradle b/Package/Android/build.gradle index d40988343..3c0efffdd 100644 --- a/Package/Android/build.gradle +++ b/Package/Android/build.gradle @@ -87,7 +87,7 @@ def configureReactNativePom(def pom) { name packageJson.title artifactId packageJson.name version = packageJson.version - group = "com.reactlibrary" + group = "com.babylonreactnative" description packageJson.description url packageJson.repository.baseUrl diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 5be9d32d3..47325dadc 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -134,13 +134,13 @@ Assembled/android/src/main Assembled/android/src/main/AndroidManifest.xml Assembled/android/src/main/java Assembled/android/src/main/java/com -Assembled/android/src/main/java/com/reactlibrary -Assembled/android/src/main/java/com/reactlibrary/BabylonNativeInterop.java -Assembled/android/src/main/java/com/reactlibrary/SnapshotDataReturnedEvent.java -Assembled/android/src/main/java/com/reactlibrary/BabylonModule.java -Assembled/android/src/main/java/com/reactlibrary/BabylonPackage.java -Assembled/android/src/main/java/com/reactlibrary/EngineViewManager.java -Assembled/android/src/main/java/com/reactlibrary/EngineView.java +Assembled/android/src/main/java/com/babylonreactnative +Assembled/android/src/main/java/com/babylonreactnative/BabylonNativeInterop.java +Assembled/android/src/main/java/com/babylonreactnative/SnapshotDataReturnedEvent.java +Assembled/android/src/main/java/com/babylonreactnative/BabylonModule.java +Assembled/android/src/main/java/com/babylonreactnative/BabylonPackage.java +Assembled/android/src/main/java/com/babylonreactnative/EngineViewManager.java +Assembled/android/src/main/java/com/babylonreactnative/EngineView.java Assembled/android/src/main/jniLibs Assembled/android/src/main/jniLibs/armeabi-v7a Assembled/android/src/main/jniLibs/armeabi-v7a/libturbomodulejsijni.so