Skip to content

Commit

Permalink
resolve deprecations, add pod option
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Dozor committed Jan 17, 2024
1 parent a2beb92 commit b363d0a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ object versions {
const val kotlin = "1.9.22"
const val dokka = "1.5.0"
const val spotless = "6.17.0"
const val serialization = "1.5.0"
const val serialization = "1.6.2"
}

object deps {
Expand Down
11 changes: 7 additions & 4 deletions smartype-receivers/smartype-mparticle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ group = GROUP
version = VERSION_NAME

kotlin {
android() {
androidTarget() {
publishLibraryVariants("release")
}
js {
Expand All @@ -36,7 +36,10 @@ kotlin {
baseName = "mParticle_Smartype"
ios.deploymentTarget = "14.3"
}
pod("mParticle-Apple-SDK/mParticle")
pod("mParticle-Apple-SDK/mParticle"){
// Add these lines
extraOpts += listOf("-compiler-option", "-fmodules")
}
}

sourceSets {
Expand Down Expand Up @@ -85,10 +88,10 @@ tasks {
}

android {
compileSdk = 31
compileSdk = 33
defaultConfig {
minSdk = 19
targetSdk = 31
targetSdk = 33
}
sourceSets {
getByName("main") {
Expand Down
11 changes: 7 additions & 4 deletions smartype/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kotlin {
binaries.executable()
}

android() {
androidTarget() {
publishLibraryVariants("release", "debug")
mavenPublication {
artifactId = "smartype"
Expand Down Expand Up @@ -67,7 +67,10 @@ kotlin {
export(project(":smartype-receivers:smartype-mparticle"))
}
}
pod("mParticle-Apple-SDK/mParticle")
pod("mParticle-Apple-SDK/mParticle"){
// Add these lines
extraOpts += listOf("-compiler-option", "-fmodules")
}
}

tasks.create("iosFatFramework", org.jetbrains.kotlin.gradle.tasks.FatFrameworkTask::class) {
Expand Down Expand Up @@ -155,10 +158,10 @@ kotlin {
}

android {
compileSdk = 31
compileSdk = 33
defaultConfig {
minSdk = 19
targetSdk = 31
targetSdk = 33
}
sourceSets {
getByName("main") {
Expand Down

0 comments on commit b363d0a

Please sign in to comment.