Skip to content

Commit 6989919

Browse files
renovate[bot]osipxd
authored andcommitted
deps: gradle-infrastructure 0.19.1
1 parent 70055b5 commit 6989919

7 files changed

Lines changed: 45 additions & 22 deletions

buildSrc/build.gradle.kts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@ plugins {
22
`kotlin-dsl`
33
}
44

5-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
6-
kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
7-
}
8-
9-
java {
10-
targetCompatibility = JavaVersion.VERSION_11
11-
sourceCompatibility = JavaVersion.VERSION_11
5+
kotlin {
6+
jvmToolchain(17)
127
}
138

149
dependencies {

buildSrc/src/main/kotlin/convention.detekt.gradle.kts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
import io.gitlab.arturbosch.detekt.*
2-
31
plugins {
42
id("io.gitlab.arturbosch.detekt")
53
}
64

7-
tasks.withType<Detekt>().configureEach {
8-
jvmTarget = JavaVersion.VERSION_11.toString()
9-
}
10-
tasks.withType<DetektCreateBaselineTask>().configureEach {
11-
jvmTarget = JavaVersion.VERSION_11.toString()
12-
}
13-
145
dependencies {
156
//noinspection UseTomlInstead
167
detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.6")
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import com.redmadrobot.build.dsl.isRunningOnCi
2+
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
3+
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
4+
5+
kotlinExtension.jvmToolchain(17)
6+
7+
// Treat all warnings as errors on CI
8+
val warningsAsErrors = findProperty("warningsAsErrors") == "true" || isRunningOnCi
9+
10+
tasks.withType<KotlinJvmCompile>().configureEach {
11+
compilerOptions {
12+
allWarningsAsErrors = warningsAsErrors
13+
// Keep the library compatible with old versions of Java.
14+
freeCompilerArgs.add("-Xjdk-release=11")
15+
}
16+
}
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
plugins {
2-
id("com.redmadrobot.android-library")
2+
kotlin("android")
3+
id("com.android.library")
4+
id("convention.jvm")
35
id("convention.publishing")
46
id("convention.detekt")
57
}
68

7-
redmadrobot {
8-
android.minSdk = 21
9+
android {
10+
compileSdk = 34
11+
12+
defaultConfig {
13+
minSdk = 21
14+
}
15+
}
16+
17+
kotlin {
18+
explicitApi()
919
}
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
plugins {
2-
id("com.redmadrobot.kotlin-library")
2+
kotlin("jvm")
3+
id("convention.jvm")
34
id("convention.publishing")
45
id("convention.detekt")
56
}
7+
8+
kotlin {
9+
explicitApi()
10+
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ activity = "1.9.0"
55
android-gradle-plugin = "8.5.1"
66
detekt = "1.23.6"
77
gradle-android-cacheFix = "3.0.1"
8-
gradle-infrastructure = "0.18.1"
8+
gradle-infrastructure = "0.19.1"
99
kotlin = "2.0.0"
1010
versionsPlugin = "0.51.0"
1111
publish-plugin = "0.29.0"

settings.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@file:Suppress("UnstableApiUsage")
12
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
23

34
pluginManagement {
@@ -13,8 +14,13 @@ pluginManagement {
1314
}
1415
}
1516

16-
@Suppress("UnstableApiUsage")
17+
plugins {
18+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
19+
}
20+
1721
dependencyResolutionManagement {
22+
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
23+
1824
repositories {
1925
mavenCentral()
2026
}

0 commit comments

Comments
 (0)