diff options
author | Ting-Yuan Huang <laszio@google.com> | 2022-12-08 11:35:41 -0800 |
---|---|---|
committer | laszio <ting-yuan@users.noreply.github.com> | 2022-12-08 12:34:18 -0800 |
commit | e488d76f7c8145728d62f9858ff6aa886fa6b8eb (patch) | |
tree | ccb263882313db0d6428fd79e475d378055bd0bd | |
parent | 2d3fe0da1d652b1c14bb4a10bdcac11fffbcb63c (diff) | |
download | ksp-e488d76f7c8145728d62f9858ff6aa886fa6b8eb.tar.gz |
Update examples
11 files changed, 28 insertions, 25 deletions
diff --git a/examples/multiplatform/build.gradle.kts b/examples/multiplatform/build.gradle.kts index 1a0c49b1..e8535316 100644 --- a/examples/multiplatform/build.gradle.kts +++ b/examples/multiplatform/build.gradle.kts @@ -6,4 +6,9 @@ subprojects { repositories { mavenCentral() } + + tasks.withType<JavaCompile>().configureEach { + sourceCompatibility = JavaVersion.VERSION_1_8.toString() + targetCompatibility = JavaVersion.VERSION_1_8.toString() + } } diff --git a/examples/multiplatform/gradle.properties b/examples/multiplatform/gradle.properties index 842f9edf..a332ce2f 100644 --- a/examples/multiplatform/gradle.properties +++ b/examples/multiplatform/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs=-Xmx2048M -kotlinVersion=1.6.20 -kspVersion=1.6.20-1.0.4 +kotlinVersion=1.7.22 +kspVersion=1.7.22-1.0.8 diff --git a/examples/multiplatform/test-processor/src/main/kotlin/TestProcessor.kt b/examples/multiplatform/test-processor/src/main/kotlin/TestProcessor.kt index 6cd525f3..0a06826d 100644 --- a/examples/multiplatform/test-processor/src/main/kotlin/TestProcessor.kt +++ b/examples/multiplatform/test-processor/src/main/kotlin/TestProcessor.kt @@ -40,13 +40,13 @@ class ClassVisitor : KSTopDownVisitor<OutputStreamWriter, Unit>() { data: OutputStreamWriter ) { super.visitClassDeclaration(classDeclaration, data) - val symbolName = classDeclaration.simpleName.asString().toLowerCase() + val symbolName = classDeclaration.simpleName.asString().lowercase() data.write(" val $symbolName = true\n") } } class TestProcessorProvider : SymbolProcessorProvider { - override fun create(env: SymbolProcessorEnvironment): SymbolProcessor { - return TestProcessor(env.codeGenerator, env.logger) + override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor { + return TestProcessor(environment.codeGenerator, environment.logger) } } diff --git a/examples/multiplatform/workload/build.gradle.kts b/examples/multiplatform/workload/build.gradle.kts index 906277b1..62a61680 100644 --- a/examples/multiplatform/workload/build.gradle.kts +++ b/examples/multiplatform/workload/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { jvm { withJava() } - js() { + js(IR) { browser() nodejs() } diff --git a/examples/playground/build.gradle.kts b/examples/playground/build.gradle.kts index cb6905b5..19af4449 100644 --- a/examples/playground/build.gradle.kts +++ b/examples/playground/build.gradle.kts @@ -2,7 +2,13 @@ plugins { kotlin("jvm") } -repositories { - mavenCentral() -} +subprojects { + repositories { + mavenCentral() + } + tasks.withType<JavaCompile>().configureEach { + sourceCompatibility = JavaVersion.VERSION_1_8.toString() + targetCompatibility = JavaVersion.VERSION_1_8.toString() + } +} diff --git a/examples/playground/gradle.properties b/examples/playground/gradle.properties index 1a8e1101..aaec2022 100644 --- a/examples/playground/gradle.properties +++ b/examples/playground/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official -kotlinVersion=1.6.20 -kspVersion=1.6.20-1.0.4
\ No newline at end of file +kotlinVersion=1.7.22 +kspVersion=1.7.22-1.0.8
\ No newline at end of file diff --git a/examples/playground/test-processor/build.gradle.kts b/examples/playground/test-processor/build.gradle.kts index 7f70b2e5..009ce54c 100644 --- a/examples/playground/test-processor/build.gradle.kts +++ b/examples/playground/test-processor/build.gradle.kts @@ -7,10 +7,6 @@ plugins { group = "com.example" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() -} - dependencies { implementation(kotlin("stdlib")) implementation("com.squareup:javapoet:1.12.1") diff --git a/examples/playground/test-processor/src/main/kotlin/BuilderProcessor.kt b/examples/playground/test-processor/src/main/kotlin/BuilderProcessor.kt index 0b9b3175..061c3291 100644 --- a/examples/playground/test-processor/src/main/kotlin/BuilderProcessor.kt +++ b/examples/playground/test-processor/src/main/kotlin/BuilderProcessor.kt @@ -49,7 +49,7 @@ class BuilderProcessor( typeName.append(">") } file.appendText(" private var $name: $typeName? = null\n") - file.appendText(" internal fun with${name.capitalize()}($name: $typeName): $className {\n") + file.appendText(" internal fun with${name.replaceFirstChar { it.uppercase() } }($name: $typeName): $className {\n") file.appendText(" this.$name = $name\n") file.appendText(" return this\n") file.appendText(" }\n\n") @@ -72,8 +72,8 @@ class BuilderProcessor( class BuilderProcessorProvider : SymbolProcessorProvider { override fun create( - env: SymbolProcessorEnvironment + environment: SymbolProcessorEnvironment ): SymbolProcessor { - return BuilderProcessor(env.codeGenerator, env.logger) + return BuilderProcessor(environment.codeGenerator, environment.logger) } }
\ No newline at end of file diff --git a/examples/playground/test-processor/src/main/kotlin/JavaBuilderProcessor.kt b/examples/playground/test-processor/src/main/kotlin/JavaBuilderProcessor.kt index a4b52743..a3eb1f15 100644 --- a/examples/playground/test-processor/src/main/kotlin/JavaBuilderProcessor.kt +++ b/examples/playground/test-processor/src/main/kotlin/JavaBuilderProcessor.kt @@ -27,7 +27,7 @@ class JavaBuilderProcessor : AbstractProcessor() { typeSpecBuilder.addField(ClassName.get(it.asType()), it.simpleName.toString(), Modifier.PRIVATE) val parameterSpec = ParameterSpec.builder(ClassName.get(it.asType()), it.simpleName.toString()).build() typeSpecBuilder.addMethod( - MethodSpec.methodBuilder("with${it.simpleName.toString().capitalize()}") + MethodSpec.methodBuilder("with${it.simpleName.toString().replaceFirstChar { it.uppercase() } }") .addParameter(parameterSpec) .addModifiers(Modifier.PUBLIC) .addStatement("this.\$N = \$N", it.simpleName, it.simpleName) diff --git a/examples/playground/test-processor/src/main/kotlin/TestProcessor.kt b/examples/playground/test-processor/src/main/kotlin/TestProcessor.kt index a02edd6d..d7858703 100644 --- a/examples/playground/test-processor/src/main/kotlin/TestProcessor.kt +++ b/examples/playground/test-processor/src/main/kotlin/TestProcessor.kt @@ -252,8 +252,8 @@ class TestProcessor( class TestProcessorProvider : SymbolProcessorProvider { override fun create( - env: SymbolProcessorEnvironment + environment: SymbolProcessorEnvironment ): SymbolProcessor { - return TestProcessor(env.codeGenerator, env.options) + return TestProcessor(environment.codeGenerator, environment.options) } } diff --git a/examples/playground/workload/build.gradle.kts b/examples/playground/workload/build.gradle.kts index 35041d8a..1a2bb8f5 100644 --- a/examples/playground/workload/build.gradle.kts +++ b/examples/playground/workload/build.gradle.kts @@ -5,10 +5,6 @@ plugins { version = "1.0-SNAPSHOT" -repositories { - mavenCentral() -} - dependencies { implementation(kotlin("stdlib")) implementation(project(":test-processor")) |