fix: build and bump versions (#48)

* fix build errors and test features

* bump android and jvm sentry versions and migrate to new android sourceset layout

* add default value for attachment contentType

* change android min sdk

* change xcode selection during build

* update readme

* manage versions through config

* review improvements

* remove unnecessary contentType

Author: buenaflor

Makefile

@@ -22,7 +22,7 @@ format:
 # build and run tests
 compile:
 	./gradlew build
-	sudo xcode-select --switch /Applications/Xcode_12.5.1.app && /usr/bin/xcodebuild -version
+	sudo xcode-select --switch /Applications/Xcode.app && /usr/bin/xcodebuild -version
 	cd ./sentry-samples/kmp-app/iosApp; pod install
 	xcodebuild -workspace ./sentry-samples/kmp-app/iosApp/iosApp.xcworkspace -scheme iosApp -configuration Debug -sdk iphonesimulator -arch arm64
 

README.md

@@ -60,7 +60,7 @@ cocoapods {
   // ...
   
   // Make sure Sentry Cocoa in your project matches this version
-  pod("Sentry", "~> 7.21.0")
+  pod("Sentry", "~> 8.2.0")
 
   framework {
     baseName = "shared"
@@ -176,7 +176,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
 ## Debug Symbols for Apple targets
 
-A dSYM upload is required for Sentry to symbolicate your crash logs for viewing. The symbolication process unscrambles Apple’s crash logs to reveal the function, variables, file names, and line numbers of the crash. The dSYM file can be uploaded through the sentry-cli tool or through a Fastlane action. Please visit our [sentry.io guide](https://docs.sentry.io/clients/cocoa/dsym/) to get started on uploading debug symbols.
+A dSYM upload is required for Sentry to symbolicate your crash logs for viewing. The symbolication process unscrambles Apple’s crash logs to reveal the function, variables, file names, and line numbers of the crash. The dSYM file can be uploaded through the sentry-cli tool or through a Fastlane action. Please visit our [sentry.io guide](https://docs.sentry.io/platforms/apple/dsym/) to get started on uploading debug symbols.
 
  ## Troubleshooting
 

build.gradle.kts

@@ -3,50 +3,21 @@ import com.vanniktech.maven.publish.MavenPublishPlugin
 import com.vanniktech.maven.publish.MavenPublishPluginExtension
 
 plugins {
-    `maven-publish`
-    id("com.vanniktech.maven.publish") version "0.18.0"
-    id("com.diffplug.spotless") version "6.7.2"
-}
-
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
-        classpath("com.android.tools.build:gradle:7.2.2")
-    }
-}
-
-spotless {
-    lineEndings = LineEnding.UNIX
-
-    kotlin {
-        target("**/*.kt")
-        ktlint()
-    }
-    kotlinGradle {
-        target("**/*.kts")
-        ktlint()
-    }
+    id(Config.gradleMavenPublishPlugin).version(Config.gradleMavenPublishPluginVersion)
+    id(Config.QualityPlugins.spotless).version(Config.QualityPlugins.spotlessVersion)
+    kotlin(Config.multiplatform).version(Config.kotlinVersion).apply(false)
+    kotlin(Config.cocoapods).version(Config.kotlinVersion).apply(false)
+    id(Config.jetpackCompose).version(Config.composeVersion).apply(false)
+    id(Config.androidGradle).version(Config.agpVersion).apply(false)
 }
 
 allprojects {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        google()
-    }
     group = "io.sentry"
     version = properties["versionName"].toString()
-
-    apply(plugin = "com.diffplug.spotless")
 }
 
 subprojects {
-    if (!this.name.contains("samples") && !this.name.contains("shared")) {
+    if (this.name.contains("sentry-kotlin-multiplatform")) {
         apply<DistributionPlugin>()
 
         val sep = File.separator
@@ -77,3 +48,16 @@ subprojects {
         }
     }
 }
+
+spotless {
+    lineEndings = LineEnding.UNIX
+
+    kotlin {
+        target("**/*.kt")
+        ktlint()
+    }
+    kotlinGradle {
+        target("**/*.kts")
+        ktlint()
+    }
+}

buildSrc/build.gradle.kts

@@ -9,5 +9,7 @@ repositories {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions {
+        jvmTarget = properties["jvm.version"].toString()
+    }
 }

buildSrc/src/main/java/Config.kt

@@ -0,0 +1,49 @@
+object Config {
+    val agpVersion = "7.4.2"
+    val kotlinVersion = "1.8.0"
+    val composeVersion = "1.3.1-rc01"
+    val gradleMavenPublishPluginVersion = "0.18.0"
+
+    val multiplatform = "multiplatform"
+    val cocoapods = "native.cocoapods"
+    val jetpackCompose = "org.jetbrains.compose"
+    val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
+    val androidGradle = "com.android.library"
+
+    object QualityPlugins {
+        val spotless = "com.diffplug.spotless"
+        val spotlessVersion = "6.11.0"
+    }
+
+    object Libs {
+        val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
+
+        val sentryJavaVersion = "6.14.0"
+        val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
+        val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
+
+        val sentryCocoaVersion = "~> 8.2.0"
+        val sentryCocoa = "Sentry"
+    }
+
+    object TestLibs {
+        val kotlinCommon = "org.jetbrains.kotlin:kotlin-test-common"
+        val kotlinCommonAnnotation = "org.jetbrains.kotlin:kotlin-test-annotations-common"
+        val kotlinJunit = "org.jetbrains.kotlin:kotlin-test-junit"
+    }
+
+    object Android {
+        private val sdkVersion = 33
+
+        val minSdkVersion = 16
+        val targetSdkVersion = sdkVersion
+        val compileSdkVersion = sdkVersion
+    }
+
+    object Cocoa {
+        val iosDeploymentTarget = "11.0"
+        val osxDeploymentTarget = "10.13"
+        val tvosDeploymentTarget = "11.0"
+        val watchosDeploymentTarget = "4.0"
+    }
+}

gradle.properties

@@ -1,20 +1,23 @@
 # Kotlin
-kotlin.version=1.7.10
+kotlin.version=1.8.0
 kotlin.incremental.multiplatform=true
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 android.useAndroidX=true
 
 # Jetpack Compose
-compose.version=1.2.0-alpha01-dev753
+compose.version=1.3.1-rc01
+
+# JVM target when compiling Kotlin
+jvm.version=1.8
 
 # Release information
 versionName=0.0.1
 
 # Increase memory for in-process compiler execution.
 org.gradle.jvmargs=-Xmx3g
 
-# because of: Please try to disable compiler caches and rerun the build. To disable compiler caches, add the following line to the gradle.properties file in the project's root directory
+# Because of: Please try to disable compiler caches and rerun the build. To disable compiler caches, add the following line to the gradle.properties file in the project's root directory
 kotlin.native.cacheKind=none
 
 # https://kotlinlang.org/docs/migrating-multiplatform-project-to-14.html#migrate-to-the-hierarchical-project-structure
@@ -23,8 +26,9 @@ kotlin.mpp.enableCompatibilityMetadataVariant=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.enableHierarchicalCommonization=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
 
-# publication pom properties
+# Publication pom properties
 POM_NAME=Sentry Kotlin Multiplatform SDK
 POM_DESCRIPTION=SDK for sentry.io
 POM_URL=https://github.com/getsentry/sentry-kotlin-multiplatform

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Feb 27 16:36:52 CET 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

sentry-kotlin-multiplatform/build.gradle.kts

@@ -8,19 +8,16 @@ plugins {
 }
 
 android {
-    compileSdk = 30
+    compileSdk = Config.Android.compileSdkVersion
     defaultConfig {
-        minSdk = 16
-        targetSdk = 30
+        minSdk = Config.Android.minSdkVersion
     }
 
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
         }
     }
-    // linking the manifest file manually due to having it in the "androidMain" source set
-    sourceSets.getByName("main").manifest.srcFile("src/androidMain/AndroidManifest.xml")
 }
 
 kotlin {
@@ -40,25 +37,25 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-stdlib")
+                implementation(Config.Libs.kotlinStd)
             }
         }
         val commonTest by getting {
             dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-test-common")
-                implementation("org.jetbrains.kotlin:kotlin-test-annotations-common")
+                implementation(Config.TestLibs.kotlinCommon)
+                implementation(Config.TestLibs.kotlinCommonAnnotation)
             }
         }
 
         val androidMain by getting {
             dependencies {
-                implementation("io.sentry:sentry-android:6.3.1") {
+                implementation(Config.Libs.sentryAndroid) {
                     // avoid duplicate dependencies since we depend on commonJvmMain
                     exclude("io.sentry", "sentry")
                 }
             }
         }
-        val androidTest by getting
+        val androidUnitTest by getting
         val jvmMain by getting
         val jvmTest by getting
 
@@ -67,18 +64,30 @@ kotlin {
             jvmMain.dependsOn(this)
             androidMain.dependsOn(this)
             dependencies {
-                implementation("io.sentry:sentry:6.3.1")
+                implementation(Config.Libs.sentryJava)
             }
         }
         val commonJvmTest by creating {
             dependsOn(commonTest)
             jvmTest.dependsOn(this)
-            androidTest.dependsOn(this)
+            androidUnitTest.dependsOn(this)
             dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-test-junit")
+                implementation(Config.TestLibs.kotlinJunit)
             }
         }
 
+        cocoapods {
+            summary = "Official Sentry SDK Kotlin Multiplatform"
+            homepage = "https://github.com/getsentry/sentry-kotlin-multiplatform"
+
+            pod(Config.Libs.sentryCocoa, Config.Libs.sentryCocoaVersion)
+
+            ios.deploymentTarget = Config.Cocoa.iosDeploymentTarget
+            osx.deploymentTarget = Config.Cocoa.osxDeploymentTarget
+            tvos.deploymentTarget = Config.Cocoa.tvosDeploymentTarget
+            watchos.deploymentTarget = Config.Cocoa.watchosDeploymentTarget
+        }
+
         val iosMain by getting
         val iosSimulatorArm64Main by getting
         val iosTest by getting
@@ -135,18 +144,6 @@ kotlin {
             commonIosTest.dependsOn(this)
             commonTvWatchMacOsTest.dependsOn(this)
         }
-
-        cocoapods {
-            summary = "Official Sentry SDK Kotlin Multiplatform"
-            homepage = "https://github.com/getsentry/sentry-kotlin-multiplatform"
-
-            pod("Sentry", "~> 7.24.1")
-
-            ios.deploymentTarget = "9.0"
-            osx.deploymentTarget = "10.10"
-            tvos.deploymentTarget = "9.0"
-            watchos.deploymentTarget = "2.0"
-        }
     }
 
     listOf(

sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec

@@ -8,11 +8,11 @@ Pod::Spec.new do |spec|
     spec.summary                  = 'Official Sentry SDK Kotlin Multiplatform'
     spec.vendored_frameworks      = 'build/cocoapods/framework/sentry_kotlin_multiplatform.framework'
     spec.libraries                = 'c++'
-    spec.ios.deployment_target = '9.0'
-    spec.osx.deployment_target = '10.10'
-    spec.tvos.deployment_target = '9.0'
-    spec.watchos.deployment_target = '2.0'
-    spec.dependency 'Sentry', '~> 7.24.1'
+    spec.ios.deployment_target = '11.0'
+    spec.osx.deployment_target = '10.13'
+    spec.tvos.deployment_target = '11.0'
+    spec.watchos.deployment_target = '4.0'
+    spec.dependency 'Sentry', '~> 8.2.0'
 
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':sentry-kotlin-multiplatform',
@@ -25,8 +25,8 @@ Pod::Spec.new do |spec|
             :execution_position => :before_compile,
             :shell_path => '/bin/sh',
             :script => <<-SCRIPT
-                if [ "YES" = "$COCOAPODS_SKIP_KOTLIN_BUILD" ]; then
-                  echo "Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\""
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
                   exit 0
                 fi
                 set -ev

sentry-kotlin-multiplatform/src/commonAppleMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.kt

@@ -19,7 +19,9 @@ internal fun CocoaSentryOptions.applyCocoaBaseOptions(options: SentryOptions) {
     this.dsn = options.dsn
     this.attachStacktrace = options.attachStackTrace
     this.dist = options.dist
-    this.environment = options.environment
+    options.environment?.let {
+        this.environment = it
+    }
     this.releaseName = options.release
     this.debug = options.debug
     this.sessionTrackingIntervalMillis = options.sessionTrackingIntervalMillis.convert()