fix delombok so javadoc can be added again and the project can be pub…

…lished to maven central
moaxcp · Jun 21, 2024 · 5023734 · 5023734
1 parent 4bf8a59
commit 5023734
Show file tree

Hide file tree

Showing 71 changed files with 117 additions and 108 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/README.md b/README.md
@@ -435,6 +435,10 @@ https://www.x.org/releases/X11R7.6/doc/libXtst/recordlib.html
 
 # versions
 
+## 0.18.1
+
+* fixing delombok task so javadoc works again and the project can be published to maven central
+
 ## 0.18.0
 
 * Switched to a multimodule project

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id 'org.sonarqube' version '5.0.0.4638'
-  id 'io.freefair.lombok' version '8.6' apply false
   id 'org.unbroken-dome.test-sets' version '4.1.0' apply false
+  id 'io.freefair.lombok' version '8.6' apply false
 }
 
 allprojects {
@@ -16,6 +16,26 @@ allprojects {
   }
 }
 
+subprojects {
+  apply plugin: 'java-library'
+  apply plugin: 'io.freefair.lombok'
+
+  java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+    withSourcesJar()
+    withJavadocJar()
+  }
+
+  delombok {
+    modulePath = classpath
+  }
+
+  dependencies {
+
+  }
+}
+
 sonar {
   properties {
     property "sonar.projectKey", "moaxcp_x11-client"

diff --git a/examples/build.gradle b/examples/build.gradle
@@ -1,8 +1,3 @@
-plugins {
-    id 'java'
-    id 'io.freefair.lombok'
-}
-
 sonar {
     skipProject = true
 }

diff --git a/settings.gradle b/settings.gradle
@@ -37,3 +37,4 @@ include 'x11-client'
 include 'x11-toolkit'
 include 'xephyr-runner'
 include 'examples'
+
diff --git a/x11-client/build.gradle b/x11-client/build.gradle
@@ -1,20 +1,12 @@
 plugins {
-    id 'java-library'
     id 'org.unbroken-dome.test-sets'
-    id 'io.freefair.lombok'
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
 }
 
 description = 'An x11 client implemented in java'
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-    withSourcesJar()
-}
-
 dependencies {
     api project(':x11-keysym')
     api project(':x11-protocol:x11-protocol-core')

diff --git a/x11-keysym/build.gradle b/x11-keysym/build.gradle
@@ -1,6 +1,4 @@
 plugins {
-    id 'java-library'
-    id 'io.freefair.lombok'
     id 'com.github.moaxcp.x11protocol'
     id 'maven-publish'
     id 'signing'

diff --git a/x11-protocol-gradle-plugin/build.gradle b/x11-protocol-gradle-plugin/build.gradle
@@ -13,12 +13,6 @@ gradlePlugin {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-    withSourcesJar()
-}
-
 repositories {
     mavenCentral()
 }

diff --git a/...-gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/X11ProtocolPluginSpec.groovy b/...-gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/X11ProtocolPluginSpec.groovy
@@ -1,5 +1,6 @@
 package com.github.moaxcp.x11protocol
 
+import com.github.moaxcp.x11protocol.GenerateX11ProtocolTask
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification

diff --git a/...dle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/generator/ConventionsSpec.groovy b/...dle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/generator/ConventionsSpec.groovy
@@ -1,5 +1,6 @@
 package com.github.moaxcp.x11protocol.generator
 
+import com.github.moaxcp.x11protocol.generator.Conventions
 import com.squareup.javapoet.ClassName
 import spock.lang.Specification
 

diff --git a/...n/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaEnumListPropertySpec.groovy b/...n/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaEnumListPropertySpec.groovy
@@ -1,6 +1,9 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaClass
+import com.github.moaxcp.x11protocol.xcbparser.JavaEnumListProperty
+import com.github.moaxcp.x11protocol.xcbparser.XUnitListField
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.CodeBlock
 import com.squareup.javapoet.ParameterizedTypeName

diff --git a/...gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaEnumSpec.groovy b/...gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaEnumSpec.groovy
@@ -1,5 +1,6 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
+import com.github.moaxcp.x11protocol.xcbparser.JavaEnum
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.TypeSpec
 import spock.lang.Specification

diff --git a/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaErrorSpec.groovy b/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaErrorSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaError
+import com.github.moaxcp.x11protocol.xcbparser.XTypeError
 
 class JavaErrorSpec extends XmlSpec {
     def requestError() {

diff --git a/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaEventSpec.groovy b/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaEventSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaEvent
+import com.github.moaxcp.x11protocol.xcbparser.XTypeEvent
 
 class JavaEventSpec extends XmlSpec {
     def keyPress() {

diff --git a/...lugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaGenericEventSpec.groovy b/...lugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaGenericEventSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaEvent
+import com.github.moaxcp.x11protocol.xcbparser.XTypeEvent
 
 class JavaGenericEventSpec extends XmlSpec {
     def configureNotify() {

diff --git a/...le-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaPadAlignSpec.groovy b/...le-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaPadAlignSpec.groovy
@@ -1,6 +1,10 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaClass
+import com.github.moaxcp.x11protocol.xcbparser.JavaPadAlign
+import com.github.moaxcp.x11protocol.xcbparser.JavaPrimativeListProperty
+import com.github.moaxcp.x11protocol.xcbparser.XUnitListField
 import com.squareup.javapoet.CodeBlock
 
 class JavaPadAlignSpec extends XmlSpec {

diff --git a/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaReplySpec.groovy b/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaReplySpec.groovy
@@ -1,6 +1,9 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaReply
+import com.github.moaxcp.x11protocol.xcbparser.JavaRequest
+import com.github.moaxcp.x11protocol.xcbparser.XTypeRequest
 
 class JavaReplySpec extends XmlSpec {
     def queryTree() {

diff --git a/...dle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaRequestSpec.groovy b/...dle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaRequestSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaRequest
+import com.github.moaxcp.x11protocol.xcbparser.XTypeRequest
 
 class JavaRequestSpec extends XmlSpec {
     def destroyWindow() {

diff --git a/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaStructSpec.groovy b/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaStructSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaStruct
+import com.github.moaxcp.x11protocol.xcbparser.XTypeStruct
 import com.squareup.javapoet.TypeSpec
 
 import static com.github.moaxcp.x11protocol.xcbparser.JavaStruct.javaStruct

diff --git a/...n/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaTypeListPropertySpec.groovy b/...n/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaTypeListPropertySpec.groovy
@@ -1,6 +1,9 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaType
+import com.github.moaxcp.x11protocol.xcbparser.JavaTypeListProperty
+import com.github.moaxcp.x11protocol.xcbparser.XUnitListField
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.ParameterizedTypeName
 import com.squareup.javapoet.TypeSpec

diff --git a/...lugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaTypePropertySpec.groovy b/...lugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaTypePropertySpec.groovy
@@ -1,6 +1,9 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaClass
+import com.github.moaxcp.x11protocol.xcbparser.JavaTypeProperty
+import com.github.moaxcp.x11protocol.xcbparser.XUnitField
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.CodeBlock
 

diff --git a/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaUnionSpec.groovy b/...radle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/JavaUnionSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaStruct
+import com.github.moaxcp.x11protocol.xcbparser.JavaUnion
 
 class JavaUnionSpec extends XmlSpec {
     def 'create behavior union'() {

diff --git a/...gin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/ReplyWithReadParamSpec.groovy b/...gin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/ReplyWithReadParamSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaReply
+import com.github.moaxcp.x11protocol.xcbparser.XTypeRequest
 
 class ReplyWithReadParamSpec extends XmlSpec {
     def getDeviceMotionEventsReply() {

diff --git a/...ol-gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/SumOfSpec.groovy b/...ol-gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/SumOfSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaReply
+import com.github.moaxcp.x11protocol.xcbparser.XTypeRequest
 
 class SumOfSpec extends XmlSpec {
     def listInputDevices() {

diff --git a/...-gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XResultSpec.groovy b/...-gradle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XResultSpec.groovy
@@ -1,5 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
+import com.github.moaxcp.x11protocol.xcbparser.XResult
+import com.github.moaxcp.x11protocol.xcbparser.XType
+import com.github.moaxcp.x11protocol.xcbparser.XTypePrimative
 import groovy.util.slurpersupport.GPathResult
 import groovy.xml.MarkupBuilder
 import spock.lang.Specification

diff --git a/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XTypeEventSpec.groovy b/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XTypeEventSpec.groovy
@@ -1,6 +1,7 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.XTypeEvent
 
 class XTypeEventSpec extends XmlSpec {
     def create() {

diff --git a/...dle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XTypeStructSpec.groovy b/...dle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XTypeStructSpec.groovy
@@ -1,5 +1,6 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
+import com.github.moaxcp.x11protocol.xcbparser.XResult
 import groovy.util.slurpersupport.GPathResult
 import groovy.xml.MarkupBuilder
 import spock.lang.Specification

diff --git a/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XTypeUnionSpec.groovy b/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XTypeUnionSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.XTypeStruct
+import com.github.moaxcp.x11protocol.xcbparser.XTypeUnion
 import com.squareup.javapoet.ClassName
 
 import static com.github.moaxcp.x11protocol.generator.Conventions.getUnionJavaName

diff --git a/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XUnitFieldSpec.groovy b/...adle-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XUnitFieldSpec.groovy
@@ -1,6 +1,8 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaClass
+import com.github.moaxcp.x11protocol.xcbparser.XUnitField
 import com.squareup.javapoet.TypeName
 
 import static com.github.moaxcp.x11protocol.xcbparser.XUnitField.xUnitField

diff --git a/...-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XUnitListFieldSpec.groovy b/...-plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XUnitListFieldSpec.groovy
@@ -1,6 +1,7 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.XUnitListField
 
 class XUnitListFieldSpec extends XmlSpec {
 

diff --git a/...plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XUnitPadFactorySpec.groovy b/...plugin/src/test/groovy/com/github/moaxcp/x11protocol/xcbparser/XUnitPadFactorySpec.groovy
@@ -1,6 +1,13 @@
 package com.github.moaxcp.x11protocol.xcbparser
 
 import com.github.moaxcp.x11protocol.XmlSpec
+import com.github.moaxcp.x11protocol.xcbparser.JavaClass
+import com.github.moaxcp.x11protocol.xcbparser.JavaPad
+import com.github.moaxcp.x11protocol.xcbparser.JavaPadAlign
+import com.github.moaxcp.x11protocol.xcbparser.JavaType
+import com.github.moaxcp.x11protocol.xcbparser.XUnit
+import com.github.moaxcp.x11protocol.xcbparser.XUnitPad
+import com.github.moaxcp.x11protocol.xcbparser.XUnitPadAlign
 
 import static com.github.moaxcp.x11protocol.xcbparser.XUnitPadFactory.xUnitPad
 

diff --git a/...c/test/groovy/com/github/moaxcp/x11protocol/xcbparser/expression/AddExpressionSpec.groovy b/...c/test/groovy/com/github/moaxcp/x11protocol/xcbparser/expression/AddExpressionSpec.groovy
@@ -1,6 +1,15 @@
 package com.github.moaxcp.x11protocol.xcbparser.expression
 
-import com.github.moaxcp.x11protocol.xcbparser.*
+
+import com.github.moaxcp.x11protocol.xcbparser.JavaClass
+import com.github.moaxcp.x11protocol.xcbparser.JavaPrimitiveProperty
+import com.github.moaxcp.x11protocol.xcbparser.XResult
+import com.github.moaxcp.x11protocol.xcbparser.XUnitField
+import com.github.moaxcp.x11protocol.xcbparser.expression.AddExpression
+import com.github.moaxcp.x11protocol.xcbparser.expression.FieldRefExpression
+import com.github.moaxcp.x11protocol.xcbparser.expression.MultiplyExpression
+import com.github.moaxcp.x11protocol.xcbparser.expression.SubtractExpression
+import com.github.moaxcp.x11protocol.xcbparser.expression.ValueExpression
 import spock.lang.Specification
 
 class AddExpressionSpec extends Specification {
@@ -34,13 +43,13 @@ class AddExpressionSpec extends Specification {
             new XUnitField(result: xResult, name: 'a', type: 'CARD8')
         )
         AddExpression expression = new AddExpression(expressions: [
-            new ValueExpression(value:7),
-            new MultiplyExpression(expressions:[
+                new ValueExpression(value:7),
+                new MultiplyExpression(expressions:[
                 new ValueExpression(value:8),
                 new FieldRefExpression(javaType: javaClass, fieldName:'a')]),
-            new SubtractExpression(expressions: [
-                new ValueExpression(value:5),
-                new ValueExpression(value:4)])])
+                new SubtractExpression(expressions: [
+                        new ValueExpression(value:5),
+                        new ValueExpression(value:4)])])
 
         when:
         String result = expression.expression.toString()

diff --git a/...est/groovy/com/github/moaxcp/x11protocol/xcbparser/expression/DivideExpressionSpec.groovy b/...est/groovy/com/github/moaxcp/x11protocol/xcbparser/expression/DivideExpressionSpec.groovy
@@ -1,6 +1,14 @@
 package com.github.moaxcp.x11protocol.xcbparser.expression
 
-import com.github.moaxcp.x11protocol.xcbparser.*
+
+import com.github.moaxcp.x11protocol.xcbparser.JavaClass
+import com.github.moaxcp.x11protocol.xcbparser.JavaPrimitiveProperty
+import com.github.moaxcp.x11protocol.xcbparser.XResult
+import com.github.moaxcp.x11protocol.xcbparser.XUnitField
+import com.github.moaxcp.x11protocol.xcbparser.expression.AddExpression
+import com.github.moaxcp.x11protocol.xcbparser.expression.DivideExpression
+import com.github.moaxcp.x11protocol.xcbparser.expression.FieldRefExpression
+import com.github.moaxcp.x11protocol.xcbparser.expression.ValueExpression
 import spock.lang.Specification
 
 class DivideExpressionSpec extends Specification {
@@ -26,11 +34,11 @@ class DivideExpressionSpec extends Specification {
             )
         }
         DivideExpression expression = new DivideExpression(expressions:[
-            new FieldRefExpression(javaType:javaClass, fieldName:'a'),
-            new AddExpression(expressions:[
+                new FieldRefExpression(javaType:javaClass, fieldName:'a'),
+                new AddExpression(expressions:[
                 new FieldRefExpression(javaType:javaClass, fieldName:'b'),
                 new FieldRefExpression(javaType:javaClass, fieldName:'c')]),
-            new FieldRefExpression(javaType:javaClass, fieldName:'d')])
+                new FieldRefExpression(javaType:javaClass, fieldName:'d')])
 
         when:
         String result = expression.expression.toString()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,4 @@ include 'x11-client'
		include 'x11-toolkit'
		include 'xephyr-runner'
		include 'examples'