diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt index 6a0c0bb..642859b 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt @@ -132,6 +132,9 @@ fun TypeSpec.Builder.origin(origin: Element) = addOriginatingElement(origin) fun AnnotationSpec.Builder.member(name: String, format: String, vararg args: Any) = addMember(name, format, args) fun AnnotationSpec.Builder.member(name: String, generate: Action) = addMember(name, CodeBlock.builder().run(generate).build()) +// Extensions for FieldSpec.Builder +fun FieldSpec.Builder.initializer(generate: Action) = initializer(CodeBlock.builder().run(generate).build()) + // Extensions for MethodSpec.Builder fun MethodSpec.Builder.javadoc(`import`: String) = addJavadoc(import) fun MethodSpec.Builder.javadoc(generate: Action) = addJavadoc(CodeBlock.builder().run(generate).build()) @@ -155,4 +158,4 @@ fun ParameterSpec.Builder.modifiers(vararg modifiers: Modifier) = addModifiers(* // Extensions for CodeBlock.Builder fun CodeBlock.Builder.controlFlow(controlFlow: String, vararg args: Any, generate: Action) = beginControlFlow(controlFlow, *args).run(generate).endControlFlow() -fun CodeBlock.Builder.indent(generate: Action) = indent().run(generate).unindent() +fun CodeBlock.Builder.indent(generate: Action) = indent().run(generate).unindent() \ No newline at end of file diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt index c6fd7c4..42b40f1 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt @@ -14,6 +14,8 @@ var Project.versionS: String version = value } +val Project.versionStripped: String get() = if (versionS.endsWith("-SNAPSHOT")) versionS.substring(0, versionS.length - "-SNAPSHOT".length) else versionS + var Project.versionType: VersionType get() = if (extra.has("versionType")) extra["versionType"] as VersionType else VersionType.RELEASE set(value) = extra.set("versionType", value)