Skip to content

Bumping to Kotlin 1.3.21. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quidryan wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −9
Open

Bumping to Kotlin 1.3.21. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.ktVersion = "1.2.70"
ext.ktVersion = "1.3.21"
repositories { jcenter() }
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ktVersion"
Expand Down
3 changes: 2 additions & 1 deletion gradle-plugin/src/main/kotlin/debuglog/DebugLogGradleSubplugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package debuglog
import com.google.auto.service.AutoService
import org.gradle.api.Project
import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
Expand All @@ -20,7 +21,7 @@ class DebugLogGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
javaCompile: AbstractCompile?,
variantData: Any?,
androidProjectHandler: Any?,
kotlinCompilation: KotlinCompilation?
kotlinCompilation: KotlinCompilation<KotlinCommonOptions>?
): List<SubpluginOption> {
val extension = project.extensions.findByType(DebugLogGradleExtension::class.java)
?: DebugLogGradleExtension()
Expand Down
15 changes: 8 additions & 7 deletions kotlin-plugin/src/main/kotlin/debuglog/plugin/DebugLogCommandLineProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package debuglog.plugin

import com.google.auto.service.AutoService
import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
import org.jetbrains.kotlin.compiler.plugin.CliOption
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
import org.jetbrains.kotlin.config.CompilerConfiguration
Expand All @@ -19,24 +20,24 @@ class DebugLogCommandLineProcessor : CommandLineProcessor {
*/
override val pluginOptions: Collection<CliOption> = listOf(
CliOption(
name = "enabled", valueDescription = "<true|false>",
optionName = "enabled", valueDescription = "<true|false>",
description = "whether to enable the debuglog plugin or not"
),
CliOption(
name = "debugLogAnnotation", valueDescription = "<fqname>",
optionName = "debugLogAnnotation", valueDescription = "<fqname>",
description = "fully qualified name of the annotation(s) to use as debug-log",
required = true, allowMultipleOccurrences = true
)
)

override fun processOption(
option: CliOption,
value: String,
configuration: CompilerConfiguration
) = when (option.name) {
option: AbstractCliOption,
value: String,
configuration: CompilerConfiguration
) = when (option.optionName) {
"enabled" -> configuration.put(KEY_ENABLED, value.toBoolean())
"debugLogAnnotation" -> configuration.appendList(KEY_ANNOTATIONS, value)
else -> error("Unexpected config option ${option.name}")
else -> error("Unexpected config option ${option.optionName}")
}
}

Expand Down