Extract convention plugins for Java and Scala language settings

Yubico · Apr 13, 2023 · db1d21a · db1d21a
1 parent b025cdc
commit db1d21a
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,15 +66,6 @@ allprojects {
 }
 
 subprojects { project ->
-  tasks.withType(JavaCompile) {
-    options.compilerArgs += '-Xlint:unchecked'
-    options.deprecation = true
-    options.encoding = 'UTF-8'
-  }
-  tasks.withType(ScalaCompile) {
-    scalaCompileOptions.additionalParameters = ['-Wunused']
-  }
-
   tasks.withType(AbstractTestTask) {
     testLogging {
       showStandardStreams = isCiBuild

diff --git a/buildSrc/src/main/kotlin/project-convention-java.gradle.kts b/buildSrc/src/main/kotlin/project-convention-java.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    java
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.withType(JavaCompile::class) {
+    options.compilerArgs.add("-Xlint:deprecation")
+    options.compilerArgs.add("-Xlint:unchecked")
+    options.encoding = "UTF-8"
+}
diff --git a/buildSrc/src/main/kotlin/project-convention-scala.gradle.kts b/buildSrc/src/main/kotlin/project-convention-scala.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    scala
+}
+
+tasks.withType(ScalaCompile::class) {
+    scalaCompileOptions.additionalParameters = listOf("-Wunused")
+}
diff --git a/test-dependent-projects/build.gradle.kts b/test-dependent-projects/build.gradle.kts
diff --git a/webauthn-server-attestation/build.gradle.kts b/webauthn-server-attestation/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
   `java-library`
-  scala
   id("info.solidsoft.pitest")
+  `project-convention-java`
+  `project-convention-scala`
   `project-convention-lombok`
   `project-convention-code-formatting`
   `project-convention-archives`
@@ -10,11 +11,6 @@ plugins {
 
 description = "Yubico WebAuthn attestation subsystem"
 
-java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 sourceSets {
   create("integrationTest") {
     compileClasspath += sourceSets.main.get().output

diff --git a/webauthn-server-core/build.gradle.kts b/webauthn-server-core/build.gradle.kts
@@ -1,8 +1,9 @@
 plugins {
   `java-library`
-  scala
   id("info.solidsoft.pitest")
   id("me.champeau.jmh") version "0.6.8"
+  `project-convention-java`
+  `project-convention-scala`
   `project-convention-lombok`
   `project-convention-code-formatting`
   `project-convention-archives`
@@ -11,11 +12,6 @@ plugins {
 
 description = "Yubico WebAuthn server core API"
 
-java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 dependencies {
   api(platform(rootProject))
 

diff --git a/webauthn-server-demo/build.gradle.kts b/webauthn-server-demo/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-  java
   war
   application
-  scala
+  `project-convention-java`
+  `project-convention-scala`
   `project-convention-lombok`
   `project-convention-code-formatting`
 }

diff --git a/yubico-util-scala/build.gradle.kts b/yubico-util-scala/build.gradle.kts
@@ -1,14 +1,11 @@
 plugins {
-  scala
+  `project-convention-java`
+  `project-convention-scala`
   `project-convention-code-formatting`
 }
 
 description = "Yubico internal Scala utilities"
 
-java {
-  targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 dependencies {
   implementation(platform(rootProject))
   implementation(platform(project(":test-platform")))

diff --git a/yubico-util/build.gradle.kts b/yubico-util/build.gradle.kts
@@ -1,8 +1,9 @@
 plugins {
   `java-library`
-  scala
   id("info.solidsoft.pitest")
   id("me.champeau.jmh") version "0.6.8"
+  `project-convention-java`
+  `project-convention-scala`
   `project-convention-lombok`
   `project-convention-code-formatting`
   `project-convention-archives`
@@ -11,11 +12,6 @@ plugins {
 
 description = "Yubico internal utilities"
 
-java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 dependencies {
   api(platform(rootProject))