Skip to content

Commit 9ff00b6

Browse files
buenaflorbuenaflor
committed
Update dependencies
1 parent 6cfba0d commit 9ff00b6

File tree

9 files changed

+99
-126
lines changed

9 files changed

+99
-126
lines changed

‎build.gradle.kts‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@ import io.gitlab.arturbosch.detekt.Detekt
55
import java.util.zip.ZipFile
66

77
plugins {
8-
id(Config.gradleMavenPublishPlugin).version(Config.gradleMavenPublishPluginVersion)
9-
id(Config.QualityPlugins.spotless).version(Config.QualityPlugins.spotlessVersion)
10-
id(Config.QualityPlugins.detekt).version(Config.QualityPlugins.detektVersion)
11-
id(Config.dokka).version(Config.dokkaVersion)
12-
kotlin(Config.multiplatform).version(Config.kotlinVersion).apply(false)
13-
kotlin(Config.cocoapods).version(Config.kotlinVersion).apply(false)
14-
id(Config.jetpackCompose).version(Config.composeVersion).apply(false)
15-
id(Config.androidGradle).version(Config.agpVersion).apply(false)
16-
id(Config.BuildPlugins.buildConfig).version(Config.BuildPlugins.buildConfigVersion).apply(false)
17-
kotlin(Config.kotlinSerializationPlugin).version(Config.kotlinVersion).apply(false)
18-
id(Config.QualityPlugins.kover).version(Config.QualityPlugins.koverVersion).apply(false)
19-
id(Config.QualityPlugins.binaryCompatibility).version(Config.QualityPlugins.binaryCompatibilityVersion)
20-
.apply(false)
8+
alias(libs.plugins.kotlin.multiplatform) apply false
9+
alias(libs.plugins.kotlin.native.cocoapods) apply false
10+
alias(libs.plugins.android.library) apply false
11+
alias(libs.plugins.kotlinx.kover) apply false
12+
alias(libs.plugins.kotlinx.binary.compatibility) apply false
13+
alias(libs.plugins.kotlin.serialization) apply false
14+
alias(libs.plugins.compose) apply false
15+
alias(libs.plugins.buildKonfig) apply false
16+
alias(libs.plugins.vanniktech.mavenPublish)
17+
alias(libs.plugins.spotless)
18+
alias(libs.plugins.dokka)
19+
alias(libs.plugins.detekt)
2120
}
2221

2322
allprojects {
@@ -155,12 +154,6 @@ private fun Project.validateKotlinMultiplatformCoreArtifacts() {
155154
}
156155
}
157156

158-
subprojects {
159-
if (project.name.contains("sentry-kotlin-multiplatform")) {
160-
apply(plugin = Config.dokka)
161-
}
162-
}
163-
164157
spotless {
165158
lineEndings = LineEnding.UNIX
166159

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,11 @@
11
object Config {
2-
val agpVersion = "7.4.2"
3-
val kotlinVersion = "1.9.23"
4-
val composeVersion = "1.6.1"
5-
val gradleMavenPublishPluginVersion = "0.18.0"
6-
7-
val multiplatform = "multiplatform"
8-
val cocoapods = "native.cocoapods"
9-
val jetpackCompose = "org.jetbrains.compose"
10-
val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
11-
val androidGradle = "com.android.library"
12-
val kotlinSerializationPlugin = "plugin.serialization"
13-
val dokka = "org.jetbrains.dokka"
14-
val dokkaVersion = "1.8.10"
15-
16-
object BuildPlugins {
17-
val buildConfig = "com.codingfeline.buildkonfig"
18-
val buildConfigVersion = "0.13.3"
19-
}
20-
21-
object QualityPlugins {
22-
val spotless = "com.diffplug.spotless"
23-
val spotlessVersion = "6.11.0"
24-
val kover = "org.jetbrains.kotlinx.kover"
25-
val koverVersion = "0.7.3"
26-
val detekt = "io.gitlab.arturbosch.detekt"
27-
val detektVersion = "1.22.0"
28-
val binaryCompatibility = "org.jetbrains.kotlinx.binary-compatibility-validator"
29-
val binaryCompatibilityVersion = "0.13.1"
30-
}
31-
322
object Libs {
33-
val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
34-
353
val sentryJavaVersion = "8.11.1"
364
val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
375
val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
386

397
val sentryCocoaVersion = "8.49.1"
408
val sentryCocoa = "Sentry"
41-
42-
object Samples {
43-
val koinVersion = "3.5.2-RC1"
44-
val koinCore = "io.insert-koin:koin-core:$koinVersion"
45-
val koinAndroid = "io.insert-koin:koin-android:$koinVersion"
46-
}
47-
}
48-
49-
object TestLibs {
50-
val kotlinCommon = "org.jetbrains.kotlin:kotlin-test-common"
51-
val kotlinCommonAnnotation = "org.jetbrains.kotlin:kotlin-test-annotations-common"
52-
val kotlinJunit = "org.jetbrains.kotlin:kotlin-test-junit"
53-
val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0-RC"
54-
val kotlinCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.0-RC"
55-
val kotlinxSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
56-
57-
val ktorClientCore = "io.ktor:ktor-client-core:2.3.6"
58-
val ktorClientSerialization = "io.ktor:ktor-client-serialization:2.3.6"
59-
val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:2.3.6"
60-
val ktorClientDarwin = "io.ktor:ktor-client-darwin:2.3.6"
61-
62-
val roboelectric = "org.robolectric:robolectric:4.9"
63-
val junitKtx = "androidx.test.ext:junit-ktx:1.1.5"
64-
val mockitoCore = "org.mockito:mockito-core:5.4.0"
65-
}
66-
67-
object Android {
68-
private val sdkVersion = 33
69-
70-
val minSdkVersion = 21
71-
val targetSdkVersion = sdkVersion
72-
val compileSdkVersion = sdkVersion
739
}
7410

7511
object Cocoa {

‎gradle/libs.versions.toml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
[versions]
2+
agp = "7.4.2"
3+
kotlin = "1.9.23"
4+
spotless = "7.0.3"
5+
dokka = "1.8.10"
6+
vanniktech-mavenPublish = "0.18.0"
7+
kover = "0.7.3"
8+
detekt = "1.22.0"
9+
binaryCompatibility = "0.13.1"
10+
buildKonfig = "0.13.3"
11+
compose = "1.6.1"
12+
android-compileSdk = "33"
13+
android-minSdk = "21"
14+
kotlinx-serialization = "1.5.0"
15+
kotlinx-coroutines = "1.7.0-RC"
16+
ktor-client = "2.3.6"
17+
mockito = "5.4.0"
18+
roboelectric = "4.9"
19+
androidx-test-junitx = "1.1.5"
20+
21+
[libraries]
22+
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
23+
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
24+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization"}
25+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines"}
26+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines"}
27+
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor-client" }
28+
ktor-client-serialization = { module = "io.ktor:ktor-client-serialization", version.ref = "ktor-client" }
29+
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor-client" }
30+
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor-client" }
31+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
32+
roboelectric = { module = "org.robolectric:robolectric", version.ref = "roboelectric" }
33+
androidx-test-junitx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-junitx" }
34+
35+
[plugins]
36+
android-library = { id = "com.android.library", version.ref = "agp" }
37+
android-application = { id = "com.android.application", version.ref = "agp" }
38+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
39+
kotlin-native-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
40+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
41+
kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
42+
kotlinx-binary-compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibility" }
43+
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
44+
vanniktech-mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-mavenPublish" }
45+
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
46+
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
47+
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
48+
buildKonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildKonfig" }

‎sentry-kotlin-multiplatform/build.gradle.kts‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,28 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
44
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
55

66
plugins {
7-
kotlin(Config.multiplatform)
8-
kotlin(Config.cocoapods)
9-
id(Config.androidGradle)
10-
id(Config.BuildPlugins.buildConfig)
11-
kotlin(Config.kotlinSerializationPlugin)
12-
id(Config.QualityPlugins.kover)
13-
id(Config.QualityPlugins.binaryCompatibility)
7+
alias(libs.plugins.kotlin.multiplatform)
8+
alias(libs.plugins.kotlin.native.cocoapods)
9+
alias(libs.plugins.android.library)
10+
alias(libs.plugins.kotlinx.kover)
11+
alias(libs.plugins.kotlinx.binary.compatibility)
12+
alias(libs.plugins.kotlin.serialization)
13+
alias(libs.plugins.buildKonfig)
14+
alias(libs.plugins.dokka)
1415
`maven-publish`
1516
}
1617

17-
koverReport {
18-
defaults {
19-
// adds the contents of the reports of `release` Android build variant to default reports
20-
mergeWith("release")
21-
}
22-
}
18+
//kover {
19+
// defaults {
20+
// // adds the contents of the reports of `release` Android build variant to default reports
21+
// mergeWith("release")
22+
// }
23+
//}
2324

2425
android {
25-
compileSdk = Config.Android.compileSdkVersion
26+
compileSdk = libs.versions.android.compileSdk.get().toInt()
2627
defaultConfig {
27-
minSdk = Config.Android.minSdkVersion
28+
minSdk = libs.versions.android.minSdk.get().toInt()
2829
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2930
}
3031
buildTypes {
@@ -78,18 +79,13 @@ kotlin {
7879
}
7980
}
8081

81-
commonMain.dependencies {
82-
implementation(Config.Libs.kotlinStd)
83-
}
84-
8582
commonTest.dependencies {
86-
implementation(Config.TestLibs.kotlinCoroutinesCore)
87-
implementation(Config.TestLibs.kotlinCoroutinesTest)
88-
implementation(Config.TestLibs.ktorClientCore)
89-
implementation(Config.TestLibs.ktorClientSerialization)
90-
implementation(Config.TestLibs.kotlinxSerializationJson)
91-
implementation(Config.TestLibs.kotlinCommon)
92-
implementation(Config.TestLibs.kotlinCommonAnnotation)
83+
implementation(libs.ktor.client.core)
84+
implementation(libs.ktor.client.serialization)
85+
implementation(libs.kotlinx.coroutines.core)
86+
implementation(libs.kotlinx.coroutines.test)
87+
implementation(libs.kotlinx.serialization.json)
88+
implementation(libs.kotlin.test)
9389
}
9490

9591
androidMain.dependencies {
@@ -99,9 +95,9 @@ kotlin {
9995
// androidUnitTest.dependencies doesn't exist
10096
val androidUnitTest by getting {
10197
dependencies {
102-
implementation(Config.TestLibs.roboelectric)
103-
implementation(Config.TestLibs.junitKtx)
104-
implementation(Config.TestLibs.mockitoCore)
98+
implementation(libs.roboelectric)
99+
implementation(libs.androidx.test.junitx)
100+
implementation(libs.mockito.core)
105101
}
106102
}
107103

@@ -118,16 +114,16 @@ kotlin {
118114
val commonJvmTest by creating {
119115
dependsOn(commonTest.get())
120116
dependencies {
121-
implementation(Config.TestLibs.kotlinJunit)
122-
implementation(Config.TestLibs.ktorClientOkHttp)
117+
implementation(libs.kotlin.test.junit)
118+
implementation(libs.ktor.client.okhttp)
123119
}
124120
}
125121

126122
androidUnitTest.dependsOn(commonJvmTest)
127123
jvmTest.get().dependsOn(commonJvmTest)
128124

129125
appleTest.dependencies {
130-
implementation(Config.TestLibs.ktorClientDarwin)
126+
implementation(libs.ktor.client.darwin)
131127
}
132128

133129
val commonTvWatchMacOsMain by creating {

‎sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ Pod::Spec.new do |spec|
5454
}
5555
]
5656

57-
end
57+
end

‎sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ plugins {
77
}
88

99
android {
10-
compileSdk = Config.Android.compileSdkVersion
10+
compileSdk = libs.versions.android.compileSdk.get().toInt()
1111
defaultConfig {
1212
applicationId = "sample.kmp.app.android"
13-
minSdk = Config.Android.minSdkVersion
14-
targetSdk = Config.Android.targetSdkVersion
13+
minSdk = libs.versions.android.minSdk.get().toInt()
14+
targetSdk = libs.versions.android.compileSdk.get().toInt()
1515
versionCode = 1
1616
versionName = "1.0"
1717
}

‎sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ kotlin {
5959
}
6060

6161
android {
62-
compileSdk = Config.Android.compileSdkVersion
62+
compileSdk = libs.versions.android.compileSdk.get().toInt()
6363
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
6464
defaultConfig {
65-
minSdk = Config.Android.minSdkVersion
65+
minSdk = libs.versions.android.minSdk.get().toInt()
6666
}
6767
}
6868

‎sentry-samples/kmp-app-spm/androidApp/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ tasks.withType<KotlinCompile> {
1616
}
1717

1818
android {
19-
compileSdk = Config.Android.compileSdkVersion
19+
compileSdk = libs.versions.android.compileSdk.get().toInt()
2020
defaultConfig {
2121
applicationId = "sample.kmp.app.android"
22-
minSdk = Config.Android.minSdkVersion
23-
targetSdk = Config.Android.targetSdkVersion
22+
minSdk = libs.versions.android.minSdk.get().toInt()
23+
targetSdk = libs.versions.android.compileSdk.get().toInt()
2424
versionCode = 1
2525
versionName = "1.0"
2626
}

‎sentry-samples/kmp-app-spm/shared/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ kotlin {
4444
}
4545

4646
android {
47-
compileSdk = Config.Android.compileSdkVersion
47+
compileSdk = libs.versions.android.compileSdk.get().toInt()
4848
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
4949
defaultConfig {
50-
minSdk = Config.Android.minSdkVersion
50+
minSdk = libs.versions.android.minSdk.get().toInt()
5151
}
5252
}
5353

0 commit comments

Comments
 (0)