File tree Expand file tree Collapse file tree 11 files changed +18
-25
lines changed Expand file tree Collapse file tree 11 files changed +18
-25
lines changed Original file line number Diff line number Diff line change 13
13
* See the License for the specific language governing permissions and
14
14
* limitations under the License.
15
15
*/
16
- import dev.panuszewski.gradle.pluginMarker
17
-
18
16
plugins {
19
17
id(" java-library" )
20
18
`kotlin- dsl`
@@ -28,18 +26,6 @@ repositories {
28
26
google()
29
27
}
30
28
31
- // Dependencies needed for the configuration of the plugins
32
- // Uses `pluginMarker` from the `typesafe-conventions` plugin, see `settings.gradle.kts`
33
- dependencies {
34
- implementation(pluginMarker(libs.plugins.bnd))
35
- implementation(pluginMarker(libs.plugins.detekt))
36
- implementation(pluginMarker(libs.plugins.dokka))
37
- implementation(pluginMarker(libs.plugins.kotlin.gradle))
38
- implementation(pluginMarker(libs.plugins.spotbugs))
39
- implementation(pluginMarker(libs.plugins.spotless))
40
- implementation(pluginMarker(libs.plugins.test.logger))
41
- }
42
-
43
29
// Spotless configuration for `buildSrc` code.
44
30
spotless {
45
31
kotlinGradle {
Original file line number Diff line number Diff line change @@ -17,5 +17,5 @@ plugins {
17
17
// Add support for `libs.versions.toml` within `buildSrc`
18
18
// https://github.com/radoslaw-panuszewski/typesafe-conventions-gradle-plugin
19
19
// https://github.com/gradle/gradle/issues/15383
20
- id(" dev.panuszewski.typesafe-conventions" ) version " 0.4.1 "
20
+ id(" dev.panuszewski.typesafe-conventions" ) version " 0.7.3 "
21
21
}
Original file line number Diff line number Diff line change 15
15
*/
16
16
package conventions
17
17
18
+ import libs
19
+
18
20
// Gradle Plugin for developing OSGi bundles with Bnd.
19
21
// https://plugins.gradle.org/plugin/biz.aQute.bnd.builder
20
22
21
- plugins { id( " biz.aQute .bnd.builder " ) }
23
+ plugins { alias(libs.plugins .bnd) }
Original file line number Diff line number Diff line change 16
16
package conventions
17
17
18
18
import io.gitlab.arturbosch.detekt.Detekt
19
+ import libs
19
20
20
21
// Static code analysis for Kotlin
21
22
// https://plugins.gradle.org/plugin/io.gitlab.arturbosch.detekt
22
- plugins { id( " io.gitlab.arturbosch. detekt" ) }
23
+ plugins { alias(libs.plugins. detekt) }
23
24
24
25
detekt {
25
26
allRules = true // fail build on any finding
Original file line number Diff line number Diff line change 15
15
*/
16
16
package conventions
17
17
18
+ import libs
19
+
18
20
// Dokka, the documentation engine for Kotlin
19
21
// https://plugins.gradle.org/plugin/org.jetbrains.dokka
20
22
plugins {
21
- id( " org.jetbrains .dokka" )
23
+ alias(libs.plugins .dokka)
22
24
id(" conventions.publishing" )
23
25
}
24
26
Original file line number Diff line number Diff line change 16
16
package conventions
17
17
18
18
import com.github.spotbugs.snom.SpotBugsTask
19
+ import libs
19
20
import org.gradle.kotlin.dsl.dependencies
20
- import project.libs
21
21
22
22
// Performs quality checks on your project's Java source files using SpotBug
23
23
// https://plugins.gradle.org/plugin/com.github.spotbugs
24
24
plugins {
25
25
id(" java-library" )
26
- id( " com.github .spotbugs" )
26
+ alias(libs.plugins .spotbugs)
27
27
}
28
28
29
29
dependencies {
Original file line number Diff line number Diff line change @@ -17,10 +17,11 @@ package conventions
17
17
18
18
import com.diffplug.gradle.spotless.SpotlessApply
19
19
import com.diffplug.gradle.spotless.SpotlessCheck
20
+ import libs
20
21
21
22
// Spotless - keep your code spotless
22
23
// https://plugins.gradle.org/plugin/com.diffplug.spotless
23
- plugins { id( " com.diffplug .spotless" ) }
24
+ plugins { alias(libs.plugins .spotless) }
24
25
25
26
val doesNotHaveACustomLicenseHeader = " /^(?s)(?!.*@custom-license-header).*/"
26
27
Original file line number Diff line number Diff line change 16
16
package conventions
17
17
18
18
import com.adarshr.gradle.testlogger.theme.ThemeType
19
+ import libs
19
20
import project.DEFAULT_JAVA_VERSION
20
21
21
22
// Default test configuration for projects
@@ -24,7 +25,7 @@ import project.DEFAULT_JAVA_VERSION
24
25
// https://plugins.gradle.org/plugin/com.adarshr.test-logger
25
26
plugins {
26
27
id(" java-library" )
27
- id( " com.adarshr .test- logger" )
28
+ alias(libs.plugins .test. logger)
28
29
}
29
30
30
31
tasks.withType<Test > {
Original file line number Diff line number Diff line change 15
15
*/
16
16
package project
17
17
18
+ import libs
18
19
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
19
20
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
20
21
21
22
plugins {
22
- kotlin( " jvm " )
23
+ alias(libs.plugins.kotlin.gradle )
23
24
id(" project.base" )
24
25
id(" conventions.bnd" )
25
26
id(" conventions.detekt" )
Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ package project
17
17
18
18
import ProjectExtensions.configureMavenPublication
19
19
import ProjectExtensions.scalaVersion
20
- import gradle.kotlin.dsl.accessors._473b9544fb0ec2c6cc860d9af4296ace.java
21
20
22
21
plugins {
23
22
id(" scala" )
You can’t perform that action at this time.
0 commit comments