Configure the validation_layers module for upload to maven central

Author: m4gr3d

config.gradle

@@ -37,6 +37,10 @@ ext {
         return releaseVersion
     }
 
+    getValidationLayersVersion = { ->
+        return "${versions.openxrVersion}-${getReleaseVersion()}"
+    }
+
     shouldNotStrip = { ->
         return project.hasProperty("doNotStrip")
     }

plugin/build.gradle

@@ -5,6 +5,8 @@ plugins {
 
 ext {
     PUBLISH_ARTIFACT_ID = 'godot-openxr-vendors'
+    PUBLISH_ARTIFACT_VERSION = getReleaseVersion()
+    PUBLISH_ARTIFACT_DESCRIPTION_LABEL = 'Godot OpenXR Vendors'
 }
 
 apply from: "../scripts/publish-module.gradle"

plugin/src/main/cpp/export/export_plugin.cpp

@@ -72,7 +72,11 @@ String OpenXRVendorsEditorExportPlugin::_get_android_aar_file_path(bool debug) c
 }
 
 String OpenXRVendorsEditorExportPlugin::_get_android_maven_central_dependency() const {
-	return "org.godotengine:godot-openxr-vendors-" + _vendor + ":" + _plugin_version;
+	String version = _plugin_version;
+	if (!version.to_lower().ends_with("-stable") && !version.to_lower().ends_with("-snapshot")) {
+		version = version + "-SNAPSHOT";
+	}
+	return "org.godotengine:godot-openxr-vendors-" + _vendor + ":" + version;
 }
 
 String OpenXRVendorsEditorExportPlugin::_get_vendor_toggle_option_name(const String &vendor_name) const {
@@ -268,7 +272,7 @@ PackedStringArray OpenXRVendorsEditorExportPlugin::_get_android_dependencies_mav
 		return maven_repos;
 	}
 
-	if (_is_vendor_plugin_enabled() && !_is_android_aar_file_available(debug) && _plugin_version.ends_with("-SNAPSHOT")) {
+	if (_is_vendor_plugin_enabled() && !_is_android_aar_file_available(debug) && !_plugin_version.to_lower().ends_with("-stable")) {
 		maven_repos.append("https://central.sonatype.com/repository/maven-snapshots/");
 	}
 	return maven_repos;

plugin/src/main/cpp/export/validation_layers_export_plugin.cpp

@@ -27,10 +27,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#include "export/export_plugin.h"
 #include "export/validation_layers_export_plugin.h"
 
 #include <godot_cpp/classes/editor_export_platform_android.hpp>
 #include <godot_cpp/classes/project_settings.hpp>
+#include <openxr/openxr.h>
 
 OpenXRValidationLayersEditorExportPlugin::OpenXRValidationLayersEditorExportPlugin() {
 	{
@@ -89,10 +91,50 @@ PackedStringArray OpenXRValidationLayersEditorExportPlugin::_get_android_librari
 		return dependencies;
 	}
 
-	if ((bool)get_option("xr_features/enable_openxr_validation_layers")) {
-		const String debug_label = debug ? "debug" : "release";
-		dependencies.append("res://addons/godotopenxrvendors/.bin/android/" + debug_label + "/openxr-validation-layers-" + debug_label + ".aar");
+	if (_is_enabled() && _is_android_aar_file_available(debug)) {
+		dependencies.append(_get_android_aar_file_path(debug));
 	}
 
 	return dependencies;
 }
+
+PackedStringArray OpenXRValidationLayersEditorExportPlugin::_get_android_dependencies(const Ref<godot::EditorExportPlatform> &platform, bool debug) const {
+	PackedStringArray dependencies;
+	if (!_supports_platform(platform)) {
+		return dependencies;
+	}
+
+	if (_is_enabled() && !_is_android_aar_file_available(debug)) {
+		dependencies.append("org.godotengine:openxr-validation-layers:" + _get_version());
+	}
+	return dependencies;
+}
+
+PackedStringArray OpenXRValidationLayersEditorExportPlugin::_get_android_dependencies_maven_repos(const Ref<godot::EditorExportPlatform> &platform, bool debug) const {
+	PackedStringArray maven_repos;
+	if (!_supports_platform(platform)) {
+		return maven_repos;
+	}
+
+	if (_is_enabled() && !_is_android_aar_file_available(debug) && !_get_version().to_lower().ends_with("-stable")) {
+		maven_repos.append("https://central.sonatype.com/repository/maven-snapshots/");
+	}
+	return maven_repos;
+}
+
+String OpenXRValidationLayersEditorExportPlugin::_get_android_aar_file_path(bool debug) const {
+	const String debug_label = debug ? "debug" : "release";
+	return "res://addons/godotopenxrvendors/.bin/android/" + debug_label + "/openxr-validation-layers-" + debug_label + ".aar";
+}
+
+String OpenXRValidationLayersEditorExportPlugin::_get_version() const  {
+	String version = vformat("%d.%d.%d-%s",
+			XR_VERSION_MAJOR(XR_CURRENT_API_VERSION),
+			XR_VERSION_MINOR(XR_CURRENT_API_VERSION),
+			XR_VERSION_PATCH(XR_CURRENT_API_VERSION),
+			PLUGIN_VERSION);
+	if (!version.to_lower().ends_with("-stable") && !version.to_lower().ends_with("-snapshot")) {
+		version = version + "-SNAPSHOT";
+	}
+	return version;
+}

plugin/src/main/cpp/include/export/validation_layers_export_plugin.h

@@ -30,6 +30,7 @@
 #pragma once
 
 #include <godot_cpp/classes/editor_export_plugin.hpp>
+#include <godot_cpp/classes/file_access.hpp>
 #include <godot_cpp/classes/ref.hpp>
 
 using namespace godot;
@@ -52,5 +53,22 @@ class OpenXRValidationLayersEditorExportPlugin : public EditorExportPlugin {
 	String _get_export_option_warning(const Ref<EditorExportPlatform> &platform, const String &option) const override;
 	TypedArray<Dictionary> _get_export_options(const Ref<EditorExportPlatform> &platform) const override;
 
+	PackedStringArray _get_android_dependencies(const Ref<EditorExportPlatform> &platform, bool debug) const override;
+	PackedStringArray _get_android_dependencies_maven_repos(const Ref<EditorExportPlatform> &platform, bool debug) const override;
 	PackedStringArray _get_android_libraries(const Ref<EditorExportPlatform> &platform, bool debug) const;
+
+private:
+	/// Path to the Android library aar file. If the return file path is not available, we
+	/// fall back to the maven central dependency.
+	String _get_android_aar_file_path(bool debug) const;
+
+	bool _is_android_aar_file_available(bool debug) const {
+		return FileAccess::file_exists(_get_android_aar_file_path(debug));
+	}
+
+	bool _is_enabled() const {
+		return (bool)get_option("xr_features/enable_openxr_validation_layers");
+	}
+
+	String _get_version() const;
 };

scripts/publish-module.gradle

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 group = ossrhGroupId
-version = getReleaseVersion()
+version = PUBLISH_ARTIFACT_VERSION
 
 afterEvaluate {
     publishing {
@@ -14,7 +14,7 @@ afterEvaluate {
                     flavorArtifactId = "$flavorArtifactId-$flavorName"
                 }
 
-                String descriptionLabel = "Godot OpenXR Vendors"
+                String descriptionLabel = PUBLISH_ARTIFACT_DESCRIPTION_LABEL
                 String buildType = variant.buildType.name
                 if (buildType == "debug") {
                     flavorArtifactId = "$flavorArtifactId-debug"
@@ -29,7 +29,7 @@ afterEvaluate {
                     // The coordinates of the library, being set from variables that we'll set up later
                     groupId ossrhGroupId
                     artifactId flavorArtifactId
-                    version getReleaseVersion()
+                    version PUBLISH_ARTIFACT_VERSION
 
                     // Mostly self-explanatory metadata
                     pom {

validation_layers/build.gradle

@@ -3,6 +3,14 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
+ext {
+    PUBLISH_ARTIFACT_ID = 'openxr-validation-layers'
+    PUBLISH_ARTIFACT_VERSION = getValidationLayersVersion()
+    PUBLISH_ARTIFACT_DESCRIPTION_LABEL = "Godot OpenXR Validation Layers"
+}
+
+apply from: "../scripts/publish-module.gradle"
+
 def khronosOpenxrValidationLayersAndroidAssetsTargetDir = file("${buildDir}/temp/openxr_validation_layers_assets")
 def khronosOpenxrValidationLayersAndroidBuildDir = file("${buildDir}/temp/openxr_validation_layers_build")
 
@@ -19,7 +27,7 @@ android {
     defaultConfig {
         minSdk versions.minSdk
         targetSdk versions.targetSdk
-        versionName getReleaseVersion()
+        versionName getValidationLayersVersion()
 
         setProperty("archivesBaseName", "openxr-validation-layers")
 
@@ -122,6 +130,11 @@ android {
             dependsOn("copyOpenxrValidationLayersAndroid${capitalizedBuildType}JSON")
         }
     }
+
+    publishing {
+        singleVariant("debug") {}
+        singleVariant("release") {}
+    }
 }
 
 task copyDebugAARToAddons(type: Copy) {