Fixed frame rotation on iOS (#28)

Author: cengiz-pz

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -78,10 +78,10 @@ body:
     label: Plugin Version
     description: What version of the plugin are you running?
     options:
-      - "1.0"
       - "1.1"
+      - "1.0"
       - Other
-    default: 1
+    default: 0
   validations:
     required: true
 - type: dropdown

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -40,10 +40,10 @@ body:
     label: Plugin Version
     description: What version of the plugin are you running?
     options:
-      - "1.0"
       - "1.1"
+      - "1.0"
       - Other
-    default: 1
+    default: 0
   validations:
     required: true
 - type: textarea

addon/addon-build.gradle.kts

@@ -152,6 +152,9 @@ tasks {
     @Suppress("UNCHECKED_CAST")
     val iosLinkerFlags = extra["iosLinkerFlags"] as List<String>
 
+    @Suppress("UNCHECKED_CAST")
+    val iosBundleFiles = extra["iosBundleFiles"] as List<String>
+
     @Suppress("UNCHECKED_CAST")
     val iosSpmDependencies = extra["iosSpmDependencies"] as List<SpmDependency>
 
@@ -209,6 +212,7 @@ tasks {
                 put("iosFrameworks", iosFrameworks.toQuotedString())
                 put("iosEmbeddedFrameworks", iosEmbeddedFrameworks.toQuotedString())
                 put("iosLinkerFlags", iosLinkerFlags.toQuotedString())
+                put("iosBundleFiles", iosBundleFiles.toQuotedString())
                 put("spmDependencies", iosSpmDependencies.toGdscriptFormat())
             }
 
@@ -239,6 +243,7 @@ tasks {
         inputs.property("iosFrameworks", iosFrameworks.joinToString())
         inputs.property("iosEmbeddedFrameworks", iosEmbeddedFrameworks.joinToString())
         inputs.property("iosLinkerFlags", iosLinkerFlags.joinToString())
+        inputs.property("iosBundleFiles", iosBundleFiles.joinToString())
         inputs.property("iosSpmDependencies", iosSpmDependencies.joinToString())
 
         outputs.dir("$outputDir/addons/GMPShared")
@@ -273,6 +278,7 @@ tasks {
                 put("iosFrameworks", iosFrameworks.toQuotedString())
                 put("iosEmbeddedFrameworks", iosEmbeddedFrameworks.toQuotedString())
                 put("iosLinkerFlags", iosLinkerFlags.toQuotedString())
+                put("iosBundleFiles", iosBundleFiles.toQuotedString())
                 put("spmDependencies", iosSpmDependencies.toGdscriptFormat())
             }
 
@@ -303,6 +309,7 @@ tasks {
         inputs.property("iosFrameworks", iosFrameworks.joinToString())
         inputs.property("iosEmbeddedFrameworks", iosEmbeddedFrameworks.joinToString())
         inputs.property("iosLinkerFlags", iosLinkerFlags.joinToString())
+        inputs.property("iosBundleFiles", iosBundleFiles.joinToString())
         inputs.property("iosSpmDependencies", iosSpmDependencies.joinToString())
 
         outputs.dir("$outputDir/addons/${pluginConfig.pluginName}")

android/android-build.gradle.kts

@@ -336,12 +336,31 @@ val testRuntimeOnlyDependencies =
             .map { findLibrary(it).get().get() }
     }
 
+val artifactType = Attribute.of("artifactType", String::class.java)
+
 dependencies {
     "rewrite"(libs.rewrite.static.analysis)
     implementation("godot:godot-lib:${godotConfig.godotVersion}.${godotConfig.godotReleaseType}@aar")
     androidDependencies.forEach { implementation(it) }
     testDependencies.forEach { testImplementation(it) }
     testRuntimeOnlyDependencies.forEach { testRuntimeOnly(it) }
+
+    attributesSchema {
+        attribute(artifactType) {
+            disambiguationRules.add(JarFirstRule::class.java)
+        }
+    }
+}
+
+// Helper class to prioritize JARs when multiple variants match
+abstract class JarFirstRule : AttributeDisambiguationRule<String> {
+    override fun execute(details: MultipleCandidatesDetails<String>) {
+        if (details.candidateValues.contains("jar")) {
+            details.closestMatch("jar")
+        } else if (details.candidateValues.contains("android-classes-jar")) {
+            details.closestMatch("android-classes-jar")
+        }
+    }
 }
 
 // -- Helpers -------------------------------------------------------------------

common/build-logic/build.gradle.kts common/build-logic/logic.gradle.ktscommon/build-logic/build.gradle.kts renamed to common/build-logic/logic.gradle.kts

@@ -3,7 +3,7 @@
 //
 
 // Compiles all convention plugins (precompiled script plugins) in
-// src/main/kotlin/*.gradle.kts and makes them - together with their
+// src/main/java/*.gradle.kts and makes them - together with their
 // runtime dependencies - available to every subproject that applies them.
 //
 // Versions are kept in sync with gradle/libs.versions.toml via the
@@ -26,3 +26,12 @@ sourceSets {
         java.srcDirs("src/main/kotlin")
     }
 }
+
+kotlin {
+    jvmToolchain(17)
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    targetCompatibility = "17"
+    sourceCompatibility = "17"
+}

common/build-logic/settings.gradle.kts

@@ -20,3 +20,4 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "build-logic"
+rootProject.buildFileName = "logic.gradle.kts"

…ild-logic/src/main/kotlin/BuildConfig.kt …build-logic/src/main/java/BuildConfig.ktcommon/build-logic/src/main/kotlin/BuildConfig.kt renamed to common/build-logic/src/main/java/BuildConfig.kt common/build-logic/src/main/kotlin/BuildConfig.kt renamed to common/build-logic/src/main/java/BuildConfig.kt

@@ -39,6 +39,7 @@ import kotlinx.serialization.decodeFromString
  * | `frameworks`          | [frameworks]            | System framework names to link, e.g. `["Foundation.framework"]` |
  * | `embedded_frameworks` | [embeddedFrameworks]    | Frameworks to embed in the app bundle (may be empty)    |
  * | `flags`               | [linkerFlags]           | Extra linker flags, e.g. `["-ObjC"]`                   |
+ * | `bundle_files`        | [bundleFiles]           | Files to include in the app bundle, e.g. `["res://afile.task"]` |
  *
  * Comma-separated properties (`frameworks`, `embedded_frameworks`, `flags`) are
  * split into [List]s at load time - blank entries are dropped - so consumers never
@@ -91,6 +92,13 @@ data class IosConfig(
      * Empty when no extra flags are required.
      */
     val linkerFlags: List<String>,
+    /**
+     * Files to include in the app bundle.
+     *
+     * Parsed from the comma-separated `bundle_files` key in `ios.properties`.
+     * Empty when no extra files are required.
+     */
+    val bundleFiles: List<String>,
     /**
      * Swift Package Manager dependencies decoded from `ios/config/spm_dependencies.json`.
      *
@@ -155,6 +163,7 @@ data class IosConfig(
                 frameworks          = props.splitList("frameworks"),
                 embeddedFrameworks  = props.splitList("embedded_frameworks"),
                 linkerFlags         = props.splitList("flags"),
+                bundleFiles         = props.splitList("bundle_files"),
                 spmDependencies     = spmDependencies,
                 testPlatform        = props.require("test_platform"),
                 testDestinationName = props.require("test_destination_name"),