Switch to integrated solution for SPM packages

.swiftpm-locks/default/.gitignore

@@ -0,0 +1 @@
+swiftPMCheckout/

.swiftpm-locks/default/swiftImport/Package.swift

@@ -0,0 +1,26 @@
+// swift-tools-version: 5.9
+import PackageDescription
+let package = Package(
+  name: "KotlinMultiplatformLinkedPackage",
+  platforms: [
+    .iOS("15.0")
+  ],
+  products: [
+    .library(
+      name: "KotlinMultiplatformLinkedPackage",
+      type: .none,
+      targets: ["KotlinMultiplatformLinkedPackage"]
+    )
+  ],
+  dependencies: [
+    .package(path: "subpackages/_composeApp")
+  ],
+  targets: [
+    .target(
+      name: "KotlinMultiplatformLinkedPackage",
+      dependencies: [
+        .product(name: "_composeApp", package: "_composeApp")
+      ]
+    )
+  ]
+)

.swiftpm-locks/default/swiftImport/subpackages/_composeApp/Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version: 5.9
+import PackageDescription
+let package = Package(
+  name: "_composeApp",
+  platforms: [
+    .iOS("15.0")
+  ],
+  products: [
+    .library(
+      name: "_composeApp",
+      type: .none,
+      targets: ["_composeApp"]
+    )
+  ],
+  dependencies: [
+    .package(
+      url: "https://github.com/maplibre/maplibre-gl-native-distribution.git",
+      from: "6.25.1"
+    )
+  ],
+  targets: [
+    .target(
+      name: "_composeApp",
+      dependencies: [
+        .product(
+          name: "MapLibre",
+          package: "maplibre-gl-native-distribution"
+        )
+      ]
+    )
+  ]
+)

composeApp/build.gradle.kts

@@ -1,5 +1,4 @@
 import com.codingfeline.buildkonfig.compiler.FieldSpec
-import io.github.frankois944.spmForKmp.swiftPackageConfig
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.net.URI
 import java.util.Properties
@@ -13,7 +12,6 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.ktorfit)
-    alias(libs.plugins.spmForKmp)
     alias(libs.plugins.buildKonfig)
 }
 
@@ -44,21 +42,22 @@ kotlin {
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->
-        @Suppress("OPT_IN_USAGE")
-        iosTarget.swiftPackageConfig(cinteropName ="spmMaplibre") {
-            dependency {
-                remotePackageVersion(
-                    url = URI("https://github.com/maplibre/maplibre-gl-native-distribution.git"),
-                    products = { add("MapLibre") },
-                    version = "6.25.1",
-                )
-            }
-        }
         iosTarget.binaries.framework {
             baseName = "ComposeApp"
             isStatic = true
         }
     }
+
+    swiftPMDependencies {
+        @Suppress("OPT_IN_USAGE")
+        swiftPackage(
+            url = url("https://github.com/maplibre/maplibre-gl-native-distribution.git"),
+            version = from("6.25.1"),
+            products = listOf(
+                product("MapLibre")
+            )
+        )
+    }
 
     sourceSets {
         iosMain.dependencies {

gradle/libs.versions.toml

@@ -71,5 +71,4 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 androidx-room = { id = "androidx.room", version.ref = "androidx-room" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 ktorfit = { id = "de.jensklingenberg.ktorfit", version.ref = "ktorfit" }
-spmForKmp = { id = "io.github.frankois944.spmForKmp", version = "1.9.2" }
 buildKonfig = { id = "com.codingfeline.buildkonfig", version = "0.21.2" }

iosApp/KotlinMultiplatformLinkedPackage/Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version: 5.9
+import PackageDescription
+let package = Package(
+  name: "KotlinMultiplatformLinkedPackage",
+  platforms: [
+    .iOS("15.0")
+  ],
+  products: [
+    .library(
+      name: "KotlinMultiplatformLinkedPackage",
+      type: .none,
+      targets: ["KotlinMultiplatformLinkedPackage"]
+    )
+  ],
+  dependencies: [
+    .package(
+      url: "https://github.com/maplibre/maplibre-gl-native-distribution.git",
+      from: "6.25.1"
+    )
+  ],
+  targets: [
+    .target(
+      name: "KotlinMultiplatformLinkedPackage",
+      dependencies: [
+        .product(
+          name: "MapLibre",
+          package: "maplibre-gl-native-distribution"
+        )
+      ]
+    )
+  ]
+)

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -6,12 +6,16 @@
 	objectVersion = 77;
 	objects = {
 
+/* Begin PBXBuildFile section */
+		46571C252D51101DC02AD50C /* KotlinMultiplatformLinkedPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 8C222A0E1646085D7D1399E5 /* KotlinMultiplatformLinkedPackage */; };
+/* End PBXBuildFile section */
+
 /* Begin PBXFileReference section */
-		272969D4DE87160D9F2F613E /* eGuasti.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = eGuasti.app; path = "/Users/alberto/Library/Caches/Google/AndroidStudio2025.2.3/DerivedData/iosApp-ejakspdjocarsqbfiyoxvizjuvlb/Build/Products/Debug-iphonesimulator/eGuasti.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		272969D4DE87160D9F2F613E /* eGuasti.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = eGuasti.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		CD095FDDE144226B736E4AD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		CD095FDDE144226B736E4AD1 /* Exceptions for "iosApp" folder in "iosApp" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Info.plist,
@@ -29,7 +33,7 @@
 		E63532EB6B781B111D762569 /* iosApp */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
-				CD095FDDE144226B736E4AD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */,
+				CD095FDDE144226B736E4AD1 /* Exceptions for "iosApp" folder in "iosApp" target */,
 			);
 			path = iosApp;
 			sourceTree = "<group>";
@@ -41,6 +45,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				46571C252D51101DC02AD50C /* KotlinMultiplatformLinkedPackage in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,6 +90,7 @@
 			);
 			name = iosApp;
 			packageProductDependencies = (
+				8C222A0E1646085D7D1399E5 /* KotlinMultiplatformLinkedPackage */,
 			);
 			productName = iosApp;
 			productReference = 272969D4DE87160D9F2F613E /* eGuasti.app */;
@@ -114,6 +120,9 @@
 			);
 			mainGroup = 877225409EEF49820DF401A3;
 			minimizedProjectReferenceProxies = 1;
+			packageReferences = (
+				7FEE7AD3358C8CC86CDC1F5C /* XCLocalSwiftPackageReference "KotlinMultiplatformLinkedPackage" */,
+			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 2B8E4434A28CED8C00E9AA46 /* Products */;
 			projectDirPath = "";
@@ -370,6 +379,20 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCLocalSwiftPackageReference section */
+		7FEE7AD3358C8CC86CDC1F5C /* XCLocalSwiftPackageReference "KotlinMultiplatformLinkedPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = KotlinMultiplatformLinkedPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		8C222A0E1646085D7D1399E5 /* KotlinMultiplatformLinkedPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = KotlinMultiplatformLinkedPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = AB2BD7A04B1D2154158FA9EB /* Project object */;
 }