From fb1660a4ad5738d1de1c97e7aef8cde8500bc335 Mon Sep 17 00:00:00 2001 From: toliner Date: Mon, 12 Oct 2020 16:10:28 +0900 Subject: [PATCH 1/4] bump dependencies version --- dsl-generator/build.gradle.kts | 13 ++++++++----- gradle.properties | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dsl-generator/build.gradle.kts b/dsl-generator/build.gradle.kts index 966916f..c6e3078 100644 --- a/dsl-generator/build.gradle.kts +++ b/dsl-generator/build.gradle.kts @@ -6,6 +6,8 @@ plugins { val awsCdkVersion: String by project version = rootProject.version.toString().split("-")[1] +val isCI = System.getenv("CI") == "true" + publishing { publications { register("maven", MavenPublication::class) { @@ -25,14 +27,15 @@ repositories { dependencies { implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9") implementation(project(":dsl-common")) - implementation("com.squareup:kotlinpoet:1.5.0") + implementation("com.squareup:kotlinpoet:1.6.0") implementation("com.google.guava:guava:28.2-jre") - // AWS CDK - implementation("software.amazon.awscdk", "lambda", awsCdkVersion) - implementation("software.amazon.awscdk", "sam", awsCdkVersion) + // AWS CDK, Only for dev & debug use + if (!isCI) { + implementation("software.amazon.awscdk", "appflow", awsCdkVersion) + } } tasks.withType { diff --git a/gradle.properties b/gradle.properties index e6f3d28..55a96b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official -awsCdkVersion=1.27.0 +awsCdkVersion=1.66.0 kotlinVersion=1.3.70 org.gradle.parallel=true \ No newline at end of file From 5a43eace62e41e3d3aa9e02cf2cd3845e43238ca Mon Sep 17 00:00:00 2001 From: toliner Date: Mon, 12 Oct 2020 16:11:21 +0900 Subject: [PATCH 2/4] fix field named "object" is not escaped --- .../justincase/cdkdsl/generator/PropClassExtensionGenerator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsl-generator/src/main/kotlin/jp/justincase/cdkdsl/generator/PropClassExtensionGenerator.kt b/dsl-generator/src/main/kotlin/jp/justincase/cdkdsl/generator/PropClassExtensionGenerator.kt index aef72db..885bda4 100644 --- a/dsl-generator/src/main/kotlin/jp/justincase/cdkdsl/generator/PropClassExtensionGenerator.kt +++ b/dsl-generator/src/main/kotlin/jp/justincase/cdkdsl/generator/PropClassExtensionGenerator.kt @@ -141,7 +141,7 @@ object PropClassExtensionGenerator { handledDuplicates += name } } else { - addStatement("${fieldName}?.let{ builder.$name(it) }") + addStatement("%N?.let{ builder.%N(it) }", fieldName, name) } } addStatement("return builder.build()") From 41337f7e91aa9d986d267f9de8382ac1fd31da8f Mon Sep 17 00:00:00 2001 From: toliner Date: Mon, 12 Oct 2020 16:16:33 +0900 Subject: [PATCH 3/4] bump kotlin version --- build.gradle.kts | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dc774f7..a87ec6f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.3.70" + kotlin("jvm") version "1.4.10" id("maven-publish") id("com.jfrog.bintray") version "1.8.4" } diff --git a/gradle.properties b/gradle.properties index 55a96b1..20a6e4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official awsCdkVersion=1.66.0 -kotlinVersion=1.3.70 +kotlinVersion=1.4.10 org.gradle.parallel=true \ No newline at end of file From 3a1f3893f6355f9dd4af407b6d48cd36de80f732 Mon Sep 17 00:00:00 2001 From: toliner Date: Mon, 12 Oct 2020 16:22:16 +0900 Subject: [PATCH 4/4] add aws-cdk/core dependency for build --- dsl-generator/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dsl-generator/build.gradle.kts b/dsl-generator/build.gradle.kts index c6e3078..f608374 100644 --- a/dsl-generator/build.gradle.kts +++ b/dsl-generator/build.gradle.kts @@ -32,6 +32,8 @@ dependencies { implementation("com.squareup:kotlinpoet:1.6.0") implementation("com.google.guava:guava:28.2-jre") + // AWS-CDK/Core, Need to compile + implementation("software.amazon.awscdk", "core", awsCdkVersion) // AWS CDK, Only for dev & debug use if (!isCI) { implementation("software.amazon.awscdk", "appflow", awsCdkVersion)