Ios simulator

GoogleMapsXC.podspec

@@ -0,0 +1,24 @@
+Pod::Spec.new do |s|
+  s.name             = 'GoogleMapsXC'
+  s.version          = "6.1.1-beta"
+  s.summary          = 'GoogleMaps with xcframework'
+  s.description      = 'GoogleMaps with xcframework description'
+  s.homepage         = 'https://github.com/icerockdev/moko-maps'
+  s.license          = { :type => 'UNKNOWN' }
+  s.authors          = 'Google'
+  s.source           = {
+    :http => "https://dl.google.com/geosdk/GoogleMaps-#{s.version}-xcframework.tar.gz",
+    :type => "tgz"
+  }
+
+  s.platform = :ios
+  s.ios.deployment_target = '12.0'
+
+  s.frameworks = ["Accelerate", "CoreData", "CoreGraphics", "CoreImage", "CoreLocation", "CoreTelephony", "CoreText", "GLKit", "ImageIO" "Metal", "OpenGLES", "QuartzCore", "SystemConfiguration", "UIKit"]
+  s.libraries = ["c++", "z"]
+  s.vendored_frameworks = [
+    "GoogleMaps.xcframework",
+    "GoogleMapsBase.xcframework",
+    "GoogleMapsCore.xcframework"
+  ]
+end

MapBoxWrapper.podspec

@@ -0,0 +1,19 @@
+Pod::Spec.new do |s|
+  s.name             = 'MapBoxWrapper'
+  s.version          = "10.4.1"
+  s.summary          = 'GoogleMaps with xcframework'
+  s.description      = 'GoogleMaps with xcframework description'
+  s.homepage         = 'https://github.com/icerockdev/moko-maps'
+  s.license          = { :type => 'UNKNOWN' }
+  s.authors          = 'Google'
+  s.source           = {
+    :http => "none",
+    :type => "tgz"
+  }
+
+  s.platform = :ios
+  s.ios.deployment_target = '12.0'
+
+  s.dependency 'MapboxMaps', "#{s.version}"
+  s.source_files = 'maps-mapbox/src/iosMain/swift/*.swift'
+end

README.md

@@ -38,9 +38,9 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:maps:0.6.0")
-    commonMainApi("dev.icerock.moko:maps-google:0.6.0")
-    commonMainApi("dev.icerock.moko:maps-mapbox:0.6.0")
+    commonMainApi("dev.icerock.moko:maps:0.7.0")
+    commonMainApi("dev.icerock.moko:maps-google:0.7.0")
+    commonMainApi("dev.icerock.moko:maps-mapbox:0.7.0")
 }
 
 kotlin.targets

build.gradle.kts

@@ -1,36 +1,32 @@
 /*
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
-import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
 
 buildscript {
     repositories {
         mavenCentral()
         google()
         gradlePluginPortal()
+        mavenLocal()
     }
+
     dependencies {
-        classpath(":maps-build-logic")
-        classpath("dev.icerock.moko:resources-generator:0.16.1")
-        classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.20")
+        classpath(libs.kotlinGradlePlugin)
+        classpath(libs.androidGradlePlugin)
+        classpath(libs.googleServicesGradlePlugin)
+        classpath(libs.firebaseGradlePlugin)
+        classpath(libs.mokoGradlePlugin)
+        classpath(libs.mobileMultiplatformGradlePlugin)
+        classpath(libs.kotlinSerializationGradlePlugin)
+        classpath(libs.mokoResourcesGeneratorGradlePlugin)
     }
 }
 
+apply(plugin = "dev.icerock.moko.gradle.publication.nexus")
+val mokoVersion = libs.versions.mokoMapsVersion.get()
 allprojects {
-    plugins.withId("org.gradle.maven-publish") {
-        group = "dev.icerock.moko"
-        version = libs.versions.mokoMapsVersion.get()
-    }
-    configurations.configureEach {
-        resolutionStrategy {
-            val coroutines: MinimalExternalModuleDependency = rootProject.libs.coroutines.get()
-            val forcedCoroutines: ModuleVersionSelector = DefaultModuleVersionSelector.newSelector(
-                coroutines.module,
-                coroutines.versionConstraint.requiredVersion
-            )
-            force(forcedCoroutines)
-        }
-    }
+    group = "dev.icerock.moko"
+    version = mokoVersion
 }
 
 tasks.register("clean", Delete::class).configure {

gradle.properties

@@ -12,6 +12,17 @@ android.enableJetifier=true
 
 xcodeproj=./sample/ios-app
 
+moko.android.targetSdk=31
+moko.android.compileSdk=31
+moko.android.minSdk=16
+
+moko.publish.name=MOKO maps
+moko.publish.description=description
+moko.publish.repo.org=icerockdev
+moko.publish.repo.name=moko-maps
+moko.publish.license=Apache-2.0
+moko.publish.developers=alex009|Aleksey Mikhailov|Aleksey.Mikhailov@icerockdev.com
+
 mobile.multiplatform.iosTargetWarning=false
 mobile.multiplatform.podsProject=sample/ios-app/Pods/Pods.xcodeproj
 kotlin.mpp.stability.nowarn=true

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlinVersion = "1.5.20"
+kotlinVersion = "1.6.10"
 lifecycleVersion = "2.2.0"
 androidAppCompatVersion = "1.2.0"
 espressoCoreVersion = "3.2.0"
@@ -13,16 +13,16 @@ mapboxNavigationVersion = "1.5.1"
 mapboxAnnotationVersion = "0.9.0"
 mapboxServicesVersion = "5.8.0"
 multidexVersion = "2.0.1"
-kotlinxSerializationVersion = "1.2.1"
-coroutinesVersion = "1.5.0-native-mt"
-ktorClientVersion = "1.6.0"
-mokoGraphicsVersion = "0.7.0"
-mokoParcelizeVersion = "0.7.1"
-mokoResourcesVersion = "0.16.1"
-mokoMvvmVersion = "0.11.0"
-mokoGeoVersion = "0.4.0"
-mokoPermissionsVersion = "0.10.1"
-mokoMapsVersion = "0.6.0"
+kotlinxSerializationVersion = "1.3.2"
+coroutinesVersion = "1.6.0-native-mt"
+ktorClientVersion = "1.6.7"
+mokoGraphicsVersion = "0.9.0"
+mokoParcelizeVersion = "0.8.0"
+mokoResourcesVersion = "0.18.0"
+mokoMvvmVersion = "0.12.0"
+mokoGeoVersion = "0.5.0"
+mokoPermissionsVersion = "0.11.0"
+mokoMapsVersion = "0.7.0"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
@@ -39,15 +39,29 @@ ktorClientOkHttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktorC
 kotlinSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
 ktorClient = { module = "io.ktor:ktor-client-core", version.ref = "ktorClientVersion" }
+
 mokoResources = { module = "dev.icerock.moko:resources", version.ref = "mokoResourcesVersion" }
 mokoParcelize = { module = "dev.icerock.moko:parcelize", version.ref = "mokoParcelizeVersion" }
 mokoGraphics = { module = "dev.icerock.moko:graphics", version.ref = "mokoGraphicsVersion" }
-mokoMvvm = { module = "dev.icerock.moko:mvvm", version.ref = "mokoMvvmVersion" }
+mokoMvvmCore = { module = "dev.icerock.moko:mvvm-core", version.ref = "mokoMvvmVersion" }
+mokoMvvmLiveData = { module = "dev.icerock.moko:mvvm-livedata", version.ref = "mokoMvvmVersion" }
+mokoMvvmDataBinding = { module = "dev.icerock.moko:mvvm-databinding", version.ref = "mokoMvvmVersion" }
 mokoGeo = { module = "dev.icerock.moko:geo", version.ref = "mokoGeoVersion" }
 mokoPermissions = { module = "dev.icerock.moko:permissions", version.ref = "mokoPermissionsVersion" }
 mokoMaps = { module = "dev.icerock.moko:maps", version.ref = "mokoMapsVersion" }
 mokoMapsGoogle = { module = "dev.icerock.moko:maps-google", version.ref = "mokoMapsVersion" }
 mokoMapsMapbox = { module = "dev.icerock.moko:maps-mapbox", version.ref = "mokoMapsVersion" }
+
 kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlinVersion" }
 ktorClientIos = { module = "io.ktor:ktor-client-ios", version.ref = "ktorClientVersion" }
 
+
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.0.4" }
+googleServicesGradlePlugin = { module = "com.google.gms:google-services", version = "4.3.8" }
+firebaseGradlePlugin = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "2.2.0" }
+mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.1.0" }
+mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.15.0" }
+mokoResourcesGeneratorGradlePlugin = { module = "dev.icerock.moko:resources-generator", version.ref = "mokoResourcesVersion" }
+kotlinSerializationGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlinVersion" }
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists