Skip to content

Commit 0193ecc

Browse files
marandanetomarandaneto
authored
Replace deprecated gradle methods (getsentry#1758)
1 parent efed2fe commit 0193ecc

24 files changed

Lines changed: 65 additions & 80 deletions

File tree

‎sentry-android-core/build.gradle.kts‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
}
1111

1212
android {
13-
compileSdkVersion(Config.Android.compileSdkVersion)
13+
compileSdk = Config.Android.compileSdkVersion
1414

1515
defaultConfig {
16-
targetSdkVersion(Config.Android.targetSdkVersion)
17-
minSdkVersion(Config.Android.minSdkVersion)
16+
targetSdk = Config.Android.targetSdkVersion
17+
minSdk = Config.Android.minSdkVersion
1818

1919
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2020

@@ -43,7 +43,7 @@ android {
4343
}
4444
}
4545

46-
lintOptions {
46+
lint {
4747
isWarningsAsErrors = true
4848
isCheckDependencies = true
4949

@@ -62,14 +62,6 @@ android {
6262
}
6363
}
6464
}
65-
val list = emptyList<String>()
66-
androidComponents {
67-
onVariants {
68-
if (it.name !in list && it.flavorName !in list && it.buildType !in list) {
69-
70-
}
71-
}
72-
}
7365

7466
tasks.withType<Test> {
7567
configure<JacocoTaskExtension> {

‎sentry-android-fragment/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
}
1111

1212
android {
13-
compileSdkVersion(Config.Android.compileSdkVersion)
13+
compileSdk = Config.Android.compileSdkVersion
1414

1515
defaultConfig {
16-
targetSdkVersion(Config.Android.targetSdkVersion)
17-
minSdkVersion(Config.Android.minSdkVersion)
16+
targetSdk = Config.Android.targetSdkVersion
17+
minSdk = Config.Android.minSdkVersion
1818

1919
// for AGP 4.1
2020
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
@@ -39,7 +39,7 @@ android {
3939
}
4040
}
4141

42-
lintOptions {
42+
lint {
4343
isWarningsAsErrors = true
4444
isCheckDependencies = true
4545

‎sentry-android-ndk/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
var sentryNativeSrc: String = "sentry-native"
1212

1313
android {
14-
compileSdkVersion(Config.Android.compileSdkVersion)
14+
compileSdk = Config.Android.compileSdkVersion
1515

1616
sentryNativeSrc = if (File("${project.projectDir}/sentry-native-local").exists()) {
1717
"sentry-native-local"
@@ -21,8 +21,8 @@ android {
2121
println("sentry-android-ndk: $sentryNativeSrc")
2222

2323
defaultConfig {
24-
targetSdkVersion(Config.Android.targetSdkVersion)
25-
minSdkVersion(Config.Android.minSdkVersionNdk) // NDK requires a higher API level than core.
24+
targetSdk = Config.Android.targetSdkVersion
25+
minSdk = Config.Android.minSdkVersionNdk // NDK requires a higher API level than core.
2626

2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828

@@ -69,7 +69,7 @@ android {
6969
}
7070
}
7171

72-
lintOptions {
72+
lint {
7373
isWarningsAsErrors = true
7474
isCheckDependencies = true
7575

‎sentry-android-okhttp/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ plugins {
1111
}
1212

1313
android {
14-
compileSdkVersion(Config.Android.compileSdkVersion)
14+
compileSdk = Config.Android.compileSdkVersion
1515

1616
defaultConfig {
17-
targetSdkVersion(Config.Android.targetSdkVersion)
18-
minSdkVersion(Config.Android.minSdkVersionOkHttp)
17+
targetSdk = Config.Android.targetSdkVersion
18+
minSdk = Config.Android.minSdkVersionOkHttp
1919

2020
// for AGP 4.1
2121
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
@@ -40,7 +40,7 @@ android {
4040
}
4141
}
4242

43-
lintOptions {
43+
lint {
4444
isWarningsAsErrors = true
4545
isCheckDependencies = true
4646

‎sentry-android-timber/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ plugins {
1212
}
1313

1414
android {
15-
compileSdkVersion(Config.Android.compileSdkVersion)
15+
compileSdk = Config.Android.compileSdkVersion
1616

1717
defaultConfig {
18-
targetSdkVersion(Config.Android.targetSdkVersion)
19-
minSdkVersion(Config.Android.minSdkVersion)
18+
targetSdk = Config.Android.targetSdkVersion
19+
minSdk = Config.Android.minSdkVersion
2020

2121
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2222

@@ -44,7 +44,7 @@ android {
4444
}
4545
}
4646

47-
lintOptions {
47+
lint {
4848
isWarningsAsErrors = true
4949
isCheckDependencies = true
5050

‎sentry-android/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55
}
66

77
android {
8-
compileSdkVersion(Config.Android.compileSdkVersion)
8+
compileSdk = Config.Android.compileSdkVersion
99

1010
defaultConfig {
11-
targetSdkVersion(Config.Android.targetSdkVersion)
12-
minSdkVersion(Config.Android.minSdkVersionNdk)
11+
targetSdk = Config.Android.targetSdkVersion
12+
minSdk = Config.Android.minSdkVersionNdk
1313
}
1414

1515
buildFeatures {

‎sentry-apache-http-client-5/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id(Config.QualityPlugins.gradleVersions)
1010
}
1111

12-
configure<JavaPluginConvention> {
12+
configure<JavaPluginExtension> {
1313
sourceCompatibility = JavaVersion.VERSION_1_8
1414
targetCompatibility = JavaVersion.VERSION_1_8
1515
}
@@ -50,8 +50,8 @@ jacoco {
5050

5151
tasks.jacocoTestReport {
5252
reports {
53-
xml.isEnabled = true
54-
html.isEnabled = false
53+
xml.required.set(true)
54+
html.required.set(false)
5555
}
5656
}
5757

‎sentry-apollo/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion
1111
}
1212

13-
configure<JavaPluginConvention> {
13+
configure<JavaPluginExtension> {
1414
sourceCompatibility = JavaVersion.VERSION_1_8
1515
targetCompatibility = JavaVersion.VERSION_1_8
1616
}
@@ -55,8 +55,8 @@ jacoco {
5555

5656
tasks.jacocoTestReport {
5757
reports {
58-
xml.isEnabled = true
59-
html.isEnabled = false
58+
xml.required.set(true)
59+
html.required.set(false)
6060
}
6161
}
6262

‎sentry-jul/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion
1111
}
1212

13-
configure<JavaPluginConvention> {
13+
configure<JavaPluginExtension> {
1414
sourceCompatibility = JavaVersion.VERSION_1_8
1515
targetCompatibility = JavaVersion.VERSION_1_8
1616
}
@@ -50,8 +50,8 @@ jacoco {
5050

5151
tasks.jacocoTestReport {
5252
reports {
53-
xml.isEnabled = true
54-
html.isEnabled = false
53+
xml.required.set(true)
54+
html.required.set(false)
5555
}
5656
}
5757

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import io.gitlab.arturbosch.detekt.Detekt
22
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
3-
import net.ltgt.gradle.errorprone.errorprone
43
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
54

65
plugins {
@@ -12,7 +11,7 @@ plugins {
1211
id(Config.QualityPlugins.detektPlugin)
1312
}
1413

15-
configure<JavaPluginConvention> {
14+
configure<JavaPluginExtension> {
1615
sourceCompatibility = JavaVersion.VERSION_1_8
1716
targetCompatibility = JavaVersion.VERSION_1_8
1817
}
@@ -50,8 +49,8 @@ jacoco {
5049

5150
tasks.jacocoTestReport {
5251
reports {
53-
xml.isEnabled = true
54-
html.isEnabled = false
52+
xml.required.set(true)
53+
html.required.set(false)
5554
}
5655
}
5756

0 commit comments

Comments
 (0)