diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e9d4e1b..60b24203 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,8 +72,6 @@ jobs: version-pattern: "^\\d+\\.\\d+\\.\\d+-SNAPSHOT$" names: | plus.sourceplus.protocol - plus.sourceplus.protocol-jvm - plus.sourceplus.protocol-js - name: Publish New Snapshot Packages if: github.ref == 'refs/heads/master' diff --git a/build.gradle.kts b/build.gradle.kts index b856b6fc..1ab30a2d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,6 @@ dependencies { testImplementation("junit:junit:4.13.2") annotationProcessor("io.vertx:vertx-codegen:$vertxVersion:processor") - kapt(findProject("codegen") ?: project(":protocol:codegen")) } tasks.withType { @@ -124,7 +123,3 @@ spotless { licenseHeader(formattedLicenseHeader) } } - -kapt { - annotationProcessor("spp.protocol.codegen.ProtocolCodeGenProcessor") -} diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts deleted file mode 100644 index 57146e87..00000000 --- a/codegen/build.gradle.kts +++ /dev/null @@ -1,15 +0,0 @@ -plugins { - kotlin("jvm") -} - -val vertxVersion: String by project -val joorVersion: String by project - -repositories { - mavenCentral() -} - -dependencies { - implementation("io.vertx:vertx-codegen:$vertxVersion") - implementation("org.jooq:joor:$joorVersion") -} diff --git a/codegen/src/main/kotlin/spp/protocol/codegen/ProtocolCodeGenProcessor.kt b/codegen/src/main/kotlin/spp/protocol/codegen/ProtocolCodeGenProcessor.kt deleted file mode 100644 index a2f81430..00000000 --- a/codegen/src/main/kotlin/spp/protocol/codegen/ProtocolCodeGenProcessor.kt +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Source++, the open-source live coding platform. - * Copyright (C) 2022 CodeBrig, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package spp.protocol.codegen - -import io.vertx.codegen.CodeGen -import io.vertx.codegen.CodeGenProcessor -import org.joor.Reflect - -/** - * Better (but still hacky) fix for https://github.com/sourceplusplus/live-platform/issues/430. - */ -@Suppress("unused") -class ProtocolCodeGenProcessor : CodeGenProcessor() { - init { - val mappers = mutableListOf>() - Reflect.on(this).set("mappers", mappers) - val inputStream = ProtocolCodeGenProcessor::class.java.getResource( - "/META-INF/vertx/json-mappers.properties" - )!!.openStream() - Reflect.onClass(CodeGenProcessor::class.java).call("loadJsonMappers", mappers, inputStream) - } -} diff --git a/settings.gradle b/settings.gradle index 894308a2..1848726d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,5 +9,3 @@ pluginManagement { } rootProject.name = 'protocol' - -include "codegen" diff --git a/codegen/src/main/resources/META-INF/vertx/json-mappers.properties b/src/main/resources/META-INF/vertx/json-mappers.properties similarity index 100% rename from codegen/src/main/resources/META-INF/vertx/json-mappers.properties rename to src/main/resources/META-INF/vertx/json-mappers.properties