Merge pull request #20 from mParticle/bugfix/killswitch

Don't delete build dir when initializing
mParticle · Jul 29, 2021 · 176085b · 176085b
2 parents aad425d + bf4fcd7
commit 176085b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -120,8 +120,8 @@ To use Smartype on Android, start by adding the generated `smartype.aar` to your
 
 ```kotlin
 dependencies {
-    implementation "com.mparticle:smartype-api:1.2.2"
-    implementation "com.mparticle:smartype-mparticle:1.2.2"
+    implementation "com.mparticle:smartype-api:1.2.3"
+    implementation "com.mparticle:smartype-mparticle:1.2.3"
     implementation fileTree(dir: 'libs', include: ['**/*.aar'])
 }
 ```

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,6 +1,6 @@
 object versions {
     const val kotlin = "1.4.31"
-    const val dokka = "0.10.1"
+    const val dokka = "1.5.0"
     const val spotless = "3.27.0"
     const val serialization = "1.1.0"
 }

diff --git a/examples/androidExample/app/build.gradle b/examples/androidExample/app/build.gradle
@@ -43,8 +43,8 @@ allprojects {
 }
 
 dependencies {
-    implementation "com.mparticle:smartype-api:1.2.1"
-    implementation "com.mparticle:smartype-mparticle:1.2.1"
+    implementation "com.mparticle:smartype-api:1.2.3"
+    implementation "com.mparticle:smartype-mparticle:1.2.3"
     implementation fileTree(dir: 'libs', include: ['**/*.aar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.0.2'

diff --git a/gradle.properties b/gradle.properties
@@ -8,5 +8,5 @@ kotlin.js.compiler=ir
 IS_PUBLISHED=false
 
 GROUP=com.mparticle
-VERSION_NAME=1.2.2
+VERSION_NAME=1.2.3
 
diff --git a/gradle/carthage.sh b/gradle/carthage.sh
@@ -0,0 +1,19 @@
+# carthage.sh
+# Usage example: ./carthage.sh build --platform iOS
+# see: https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md
+set -euo pipefail
+
+xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+
+# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
+# the build will fail on lipo due to duplicate architectures.
+
+CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
+echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$CURRENT_XCODE_VERSION = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig
+
+echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig
+echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+
+export XCODE_XCCONFIG_FILE="$xcconfig"
+carthage "$@"
diff --git a/smartype-generator/src/main/kotlin/com/mparticle/smartype/generator/Generator.kt b/smartype-generator/src/main/kotlin/com/mparticle/smartype/generator/Generator.kt
@@ -158,7 +158,7 @@ class Generate : CliktCommand(name="generate", help = "Generate Smartype Client
 
         val directory =
             File(System.getProperty("user.dir")).resolve(File(binOutputDirectory))
-        directory.deleteRecursively()
+
         if (!directory.exists()) {
             directory.mkdirs()
         }

diff --git a/smartype-receivers/smartype-mparticle/build.gradle.kts b/smartype-receivers/smartype-mparticle/build.gradle.kts
@@ -97,8 +97,7 @@ kotlin {
 // Create Carthage tasks
 listOf("bootstrap", "update").forEach { type ->
     task<Exec>("carthage${type.capitalize()}") {
-        group = "carthage"
-        executable = "carthage"
+        commandLine("$rootDir/gradle/carthage.sh")
         args(
             type,
             "--platform", "iOS",
@@ -120,9 +119,9 @@ tasks.named<Delete>("clean") {
 
 tasks {
     val javadocJar by creating(Jar::class) {
-        dependsOn(dokka)
+        dependsOn(org.jetbrains.dokka.gradle.DokkaTask::class)
         archiveClassifier.set("javadoc")
-        from(dokka)
+        from(org.jetbrains.dokka.gradle.DokkaTask::class)
     }
 }
 

diff --git a/smartype/build.gradle.kts b/smartype/build.gradle.kts
@@ -146,8 +146,7 @@ kotlin {
 }
 listOf("bootstrap", "update").forEach { type ->
     task<Exec>("carthage${type.capitalize()}") {
-        group = "carthage"
-        executable = "carthage"
+        commandLine("$rootDir/gradle/carthage.sh")
         args(
             type,
             "--platform", "iOS",