Move maven central convention plugin to new package

mattbertolini · mattbertolini · commit 88886c8616c5 · 2023-06-09T12:28:42.000-04:00
diff --git a/buildSrc/src/main/kotlin/com/mattbertolini/buildlogic/java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com/mattbertolini/buildlogic/java-conventions.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion))
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/com/mattbertolini/buildlogic/maven-central-publish.gradle.kts b/buildSrc/src/main/kotlin/com/mattbertolini/buildlogic/maven-central-publish.gradle.kts
@@ -1,4 +1,4 @@
-package com.mattbertolini.build
+package com.mattbertolini.buildlogic
 
 plugins {
     java
diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     testCompileOnly("org.hamcrest:hamcrest") // Version defined in Spring BOM file
 }
 
-tasks.compileJava {
+tasks.named<JavaCompile>("compileJava").configure {
     options.release.set(17)
 }
 
diff --git a/spring-annotated-data-binder-core/build.gradle.kts b/spring-annotated-data-binder-core/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.mattbertolini.buildlogic.java-library")
-    id("com.mattbertolini.build.maven-central-publish")
+    id("com.mattbertolini.buildlogic.maven-central-publish")
 }
 
 dependencies {
diff --git a/spring-webflux-annotated-data-binder/build.gradle.kts b/spring-webflux-annotated-data-binder/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.mattbertolini.buildlogic.java-library")
-    id("com.mattbertolini.build.maven-central-publish")
+    id("com.mattbertolini.buildlogic.maven-central-publish")
 }
 
 dependencies {
diff --git a/spring-webmvc-annotated-data-binder/build.gradle.kts b/spring-webmvc-annotated-data-binder/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.mattbertolini.buildlogic.java-library")
-    id("com.mattbertolini.build.maven-central-publish")
+    id("com.mattbertolini.buildlogic.maven-central-publish")
 }
 
 dependencies {
diff --git a/webflux-annotated-data-binder-spring-boot-starter/build.gradle.kts b/webflux-annotated-data-binder-spring-boot-starter/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.mattbertolini.buildlogic.java-library")
-    id("com.mattbertolini.build.maven-central-publish")
+    id("com.mattbertolini.buildlogic.maven-central-publish")
 }
 
 dependencies {
diff --git a/webmvc-annotated-data-binder-spring-boot-starter/build.gradle.kts b/webmvc-annotated-data-binder-spring-boot-starter/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.mattbertolini.buildlogic.java-library")
-    id("com.mattbertolini.build.maven-central-publish")
+    id("com.mattbertolini.buildlogic.maven-central-publish")
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`
`8`	`8`	`java {`
`9`	`9`	`toolchain {`
`10`		`- languageVersion.set(JavaLanguageVersion.of(17))`
	`10`	`+ languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion))`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.mattbertolini.build`
	`1`	`+package com.mattbertolini.buildlogic`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`java`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dependencies {`
`18`	`18`	`testCompileOnly("org.hamcrest:hamcrest") // Version defined in Spring BOM file`
`19`	`19`	`}`
`20`	`20`
`21`		`-tasks.compileJava {`
	`21`	`+tasks.named<JavaCompile>("compileJava").configure {`
`22`	`22`	`options.release.set(17)`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("com.mattbertolini.buildlogic.java-library")`
`3`		`- id("com.mattbertolini.build.maven-central-publish")`
	`3`	`+ id("com.mattbertolini.buildlogic.maven-central-publish")`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`