Skip to content

Commit

Permalink
Removed addon management from the plugin.
Browse files Browse the repository at this point in the history
  • Loading branch information
Frontrider committed Jan 22, 2023
1 parent 671ae8e commit 2787dba
Show file tree
Hide file tree
Showing 14 changed files with 4 additions and 6,808 deletions.
55 changes: 2 additions & 53 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ plugins {
`java-gradle-plugin`
`maven-publish`
id("com.gradle.plugin-publish") version "1.0.0"
id("org.openapi.generator") version "6.2.1"
}

group = "io.github.frontrider.godle"
version = "0.13.0"
version = "0.14.0"

repositories {
mavenCentral()
Expand All @@ -21,6 +20,7 @@ allprojects {

val openapiDir = "$buildDir/generated"
val generatedLicenseSource = project.buildDir.absolutePath+"/license/src"

java {
sourceSets {
main {
Expand All @@ -47,43 +47,21 @@ val integrationTest: SourceSet by sourceSets.creating
addExtendsFromRelation("integrationTestImplementation", "testImplementation")
addExtendsFromRelation("functionalTestImplementation", "testImplementation")

val swaggerAnnotationsVersion = "1.5.22"
val jacksonVersion = "2.13.4"
val jakartaAnnotationVersion = "1.3.5"

dependencies {

implementation(gradleApi())
testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation("org.apache.commons:commons-lang3:3.12.0")
// https://mvnrepository.com/artifact/commons-io/commons-io
implementation("commons-io:commons-io:2.11.0")
//downloader plugin.
implementation("fi.linuxbox.gradle:gradle-download:0.6")

// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
//json parsing to interact with the godot asset store.
implementation("com.fasterxml.jackson.core:jackson-core:2.14.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.14.0")
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.0")

testImplementation(gradleTestKit())
testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
testImplementation("org.junit.platform:junit-platform-runner:1.9.0")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0")

//openapi:
implementation("io.swagger:swagger-annotations:$swaggerAnnotationsVersion")
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
implementation("org.openapitools:jackson-databind-nullable:0.2.4")
implementation("jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationVersion")
}

pluginBundle {
Expand Down Expand Up @@ -150,32 +128,3 @@ tasks.withType<Test> {
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}

openApiGenerate {
generatorName.set("java")
inputSpec.set("$rootDir/src/main/resources/AssetStore.yaml")
outputDir.set(openapiDir)
apiPackage.set("godot.assets.api")
modelPackage.set("godot.assets.model")
invokerPackage.set("godot.assets.invoker")

configOptions.putAll(
mapOf(
"annotationLibrary" to "swagger1",
"apiPackage" to "godot.assets.api",
"invokerPackage" to "godot.assets.invoker",
"modelPackage" to "godot.assets.model",
"groupId" to "godot.assets",
"serializationLibrary" to "jackson",
"performBeanValidation" to "false",
"artifactId" to "godot",
"library" to "native",
"ensureUniqueParams" to "true",
"snapshotVersion" to "false",
"dateLibrary" to "legacy",
"sortParamsByRequiredFlag" to "true",
"sortModelPropertiesByRequiredFlag" to "true",
"useSingleRequestParameter" to "false"
)
)
}
Binary file removed godle-logo.png
Binary file not shown.
11 changes: 0 additions & 11 deletions src/main/kotlin/dsl/GodleExtension.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package io.github.frontrider.godle.dsl

import io.github.frontrider.godle.DefaultGodotVersion
import io.github.frontrider.godle.dsl.addon.GodotAddonExtension
import io.github.frontrider.godle.dsl.versioning.GodotVersion
import io.github.frontrider.godle.dsl.versioning.godot
import org.gradle.api.Action
import org.gradle.api.Project
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.model.ObjectFactory
import org.gradle.api.provider.Property
import org.gradle.api.tasks.Nested
import javax.inject.Inject

/**
Expand All @@ -28,14 +25,6 @@ abstract class GodleExtension @Inject constructor(objectFactory: ObjectFactory,
//set it to true, to create a blank godot project in the godot root.
var createBlankProject = true

//DSL for godot addons.
@Nested
abstract fun getAddons(): GodotAddonExtension

open fun addons(action: Action<in GodotAddonExtension>) {
action.execute(getAddons())
}

val env = HashMap<String, String>()
fun env(key: String, value: String) {
env[key] = value
Expand Down
73 changes: 0 additions & 73 deletions src/main/kotlin/dsl/addon/AddonConfig.kt

This file was deleted.

73 changes: 0 additions & 73 deletions src/main/kotlin/dsl/addon/GodotAddon.kt

This file was deleted.

102 changes: 0 additions & 102 deletions src/main/kotlin/dsl/addon/GodotAddonDependencyContainer.kt

This file was deleted.

Loading

0 comments on commit 2787dba

Please sign in to comment.