Fix maven dependency resolution issue

The issue is caused because the 'common' module was not exposed at the maven layer. This has been resolved by removing the 'common' module as an Android library from the project, selecting instead to include its source files directly into the modules that depended on it.
m4gr3d · Nov 28, 2023 · 6c3b3fc · 6c3b3fc
1 parent a63ecc7
commit 6c3b3fc
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ devices (e.g: Meta, Pico devices) and access vendor-specific OpenXR extensions
 **Note:** 
 
 Version `2.x` of this plugin requires **Godot 4.2**.
-Check the [`1.x` branch](https://github.com/GodotVR/godot_openxr_loaders/tree/1.x) and releases 
+Check the [`1.x` branch](https://github.com/GodotVR/godot_openxr_vendors/tree/1.x) and releases 
 for support on prior versions of Godot 4.
 
 ## Building this asset
@@ -52,10 +52,10 @@ gradlew.bat build
 
 ## Downloading this asset
 
-It is possible to download compiled assets that have been released from [releases](https://github.com/GodotVR/godot_openxr_loaders/releases).
+It is possible to download compiled assets that have been released from [releases](https://github.com/GodotVR/godot_openxr_vendors/releases).
 The latest official release will be made available in Godot's asset library.
 
-Work in progress builds are available under [actions](https://github.com/GodotVR/godot_openxr_loaders/actions).
+Work in progress builds are available under [actions](https://github.com/GodotVR/godot_openxr_vendors/actions).
 
 ## Using this asset
 

diff --git a/common/.gitignore b/common/.gitignore
diff --git a/common/build.gradle b/common/build.gradle
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
diff --git a/config.gradle b/config.gradle
@@ -1,5 +1,5 @@
-final snapshotGodotAndroidLib = "org.godotengine:godot:4.2.0.beta-SNAPSHOT"
-final stableGodotAndroidLib = "org.godotengine:godot:4.1.0.stable"
+final snapshotGodotAndroidLib = "org.godotengine:godot:4.2.0.rc-SNAPSHOT"
+final stableGodotAndroidLib = "org.godotengine:godot:4.2.0.stable"
 
 ext {
     versions = [

diff --git a/demo/addons/godotopenxrvendors/plugin.cfg b/demo/addons/godotopenxrvendors/plugin.cfg
@@ -2,6 +2,6 @@
 
 name="GodotOpenXRVendors"
 description="Godot OpenXR Vendors plugin"
-author="https://github.com/GodotVR/godot_openxr_loaders/blob/master/CONTRIBUTORS.md"
-version="2.0.0-stable"
+author="https://github.com/GodotVR/godot_openxr_vendors/blob/master/CONTRIBUTORS.md"
+version="2.0.1-stable"
 script="godot_openxr_export_plugin.gd"
diff --git a/demo/viewport_2d_in_3d.tscn b/demo/viewport_2d_in_3d.tscn
@@ -6,19 +6,20 @@
 resource_local_to_scene = true
 size = Vector2(3, 2)
 
-[sub_resource type="ViewportTexture" id="ViewportTexture_jkt4l"]
+[sub_resource type="ViewportTexture" id="ViewportTexture_t3jq3"]
 viewport_path = NodePath("Viewport")
 
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qvuhp"]
-resource_local_to_scene = true
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_g5evq"]
 transparency = 1
 cull_mode = 2
-shading_mode = 0
-albedo_texture = SubResource("ViewportTexture_jkt4l")
+albedo_texture = SubResource("ViewportTexture_t3jq3")
 texture_filter = 1
 
 [node name="Viewport2Din3D" type="Node3D"]
 script = ExtResource("1_g46wu")
+alpha_scissor_threshold = 0.25
+unshaded = false
+filter = true
 
 [node name="Viewport" type="SubViewport" parent="."]
 disable_3d = true
@@ -29,4 +30,4 @@ render_target_update_mode = 1
 
 [node name="Screen" type="MeshInstance3D" parent="."]
 mesh = SubResource("QuadMesh_o4aht")
-surface_material_override/0 = SubResource("StandardMaterial3D_qvuhp")
+surface_material_override/0 = SubResource("StandardMaterial3D_g5evq")
diff --git a/godotopenxrkhronos/build.gradle b/godotopenxrkhronos/build.gradle
@@ -29,6 +29,12 @@ android {
         doNotStrip '**/*.so'
     }
 
+    sourceSets {
+        main {
+            java.srcDirs += ['../common/src/main/java']
+        }
+    }
+
     compileOptions {
         sourceCompatibility versions.javaVersion
         targetCompatibility versions.javaVersion
@@ -47,8 +53,6 @@ android {
 }
 
 dependencies {
-    implementation project(":common")
-
     implementation "androidx.core:core-ktx:$versions.coreKtxVersion"
     compileOnly libraries.godotAndroidLib
 }

diff --git a/godotopenxrlynx/build.gradle b/godotopenxrlynx/build.gradle
@@ -29,6 +29,12 @@ android {
         doNotStrip '**/*.so'
     }
 
+    sourceSets {
+        main {
+            java.srcDirs += ['../common/src/main/java']
+        }
+    }
+
     compileOptions {
         sourceCompatibility versions.javaVersion
         targetCompatibility versions.javaVersion
@@ -47,8 +53,6 @@ android {
 }
 
 dependencies {
-    implementation project(":common")
-
     implementation "androidx.core:core-ktx:$versions.coreKtxVersion"
     compileOnly libraries.godotAndroidLib
 }

diff --git a/godotopenxrmeta/build.gradle b/godotopenxrmeta/build.gradle
@@ -35,6 +35,12 @@ android {
         doNotStrip '**/*.so'
     }
 
+    sourceSets {
+        main {
+            java.srcDirs += ['../common/src/main/java']
+        }
+    }
+
     compileOptions {
         sourceCompatibility versions.javaVersion
         targetCompatibility versions.javaVersion
@@ -63,8 +69,6 @@ android {
 }
 
 dependencies {
-    implementation project(":common")
-
     implementation "androidx.core:core-ktx:$versions.coreKtxVersion"
     compileOnly libraries.godotAndroidLib
 }

diff --git a/godotopenxrpico/build.gradle b/godotopenxrpico/build.gradle
@@ -29,6 +29,12 @@ android {
         doNotStrip '**/*.so'
     }
 
+    sourceSets {
+        main {
+            java.srcDirs += ['../common/src/main/java']
+        }
+    }
+
     compileOptions {
         sourceCompatibility versions.javaVersion
         targetCompatibility versions.javaVersion
@@ -47,8 +53,6 @@ android {
 }
 
 dependencies {
-    implementation project(":common")
-
     implementation "androidx.core:core-ktx:$versions.coreKtxVersion"
     compileOnly libraries.godotAndroidLib
 }

diff --git a/scripts/publish-module.gradle b/scripts/publish-module.gradle
@@ -19,11 +19,11 @@ afterEvaluate {
                 pom {
                     name = PUBLISH_ARTIFACT_ID
                     description = 'Godot OpenXR Vendors'
-                    url = 'https://github.com/GodotVR/godot_openxr_loaders#readme'
+                    url = 'https://github.com/GodotVR/godot_openxr_vendors#readme'
                     licenses {
                         license {
                             name = 'MIT License'
-                            url = 'https://github.com/GodotVR/godot_openxr_loaders/blob/master/LICENSE'
+                            url = 'https://github.com/GodotVR/godot_openxr_vendors/blob/master/LICENSE'
                         }
                     }
                     developers {
@@ -50,9 +50,9 @@ afterEvaluate {
 
                     // Version control info - if you're using GitHub, follow the format as seen here
                     scm {
-                        connection = 'scm:git:github.com/GodotVR/godot_openxr_loaders.git'
-                        developerConnection = 'scm:git:ssh://github.com/GodotVR/godot_openxr_loaders.git'
-                        url = 'https://github.com/GodotVR/godot_openxr_loaders/tree/master'
+                        connection = 'scm:git:github.com/GodotVR/godot_openxr_vendors.git'
+                        developerConnection = 'scm:git:ssh://github.com/GodotVR/godot_openxr_vendors.git'
+                        url = 'https://github.com/GodotVR/godot_openxr_vendors/tree/master'
                     }
                 }
             }

diff --git a/settings.gradle b/settings.gradle
@@ -22,5 +22,4 @@ dependencyResolutionManagement {
     }
 }
 rootProject.name = "GodotOpenXRVendors"
-include ':common'
 include ':godotopenxrmeta', ':godotopenxrpico', ':godotopenxrkhronos', ':godotopenxrlynx'
diff --git a/thirdparty/godot-cpp b/thirdparty/godot-cpp
+1 −1		.github/workflows/ci.yml
+2 −3		CMakeLists.txt
+1 −3		binding_generator.py
+2 −2		gdextension/extension_api.json
+25 −7		include/godot_cpp/godot.hpp
+70 −20		src/godot.cpp
+3 −5		tools/android.py
+17 −0		tools/godotcpp.py
+1 −1		tools/ios.py