Skip to content
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

D.marin/ktlint #1081

Merged
merged 6 commits into from
Oct 12, 2022
Merged

D.marin/ktlint #1081

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01e5722
Update ktlint task to use a dedicated image
daniel-m-dd Oct 12, 2022
581817c
Update ktlint to 0.45.1
daniel-m-dd Oct 12, 2022
3fa28c1
Remove ktlint gradle plugin
daniel-m-dd Oct 12, 2022
ae74c71
Add Ktlnt version to CONTRIBUTING
daniel-m-dd Oct 12, 2022
8bb2803
Rollback formatting on CONTRIBUTING.md
daniel-m-dd Oct 12, 2022
a36fdcc
Update CONTRIBUTING with ktlint format
daniel-m-dd Oct 12, 2022
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
7 changes: 4 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ create_key:
# STATIC ANALYSIS

analysis:ktlint:
tags: [ "runner:main" ]
image: $CI_IMAGE_DOCKER
tags: [ "runner:docker" ]
stage: analysis
timeout: 30m
image: "registry.ddbuild.io/mobile/images/ktlint:v0.1.0"
script:
- GRADLE_OPTS="-Xmx2560m" ./gradlew :ktlintCheckAll --stacktrace --no-daemon
- echo "Using Ktlint version $(ktlint --version)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it also means we have to keep local ktlint version in sync with the version used in the image (because the rules may be different)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, exactly.
In a second step, we might find a way to ensure this condition or make it easier to upgrade/be in sync. Any ideas?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the only way is to just build a new docker image with a different tag (or have a fat docker image with multiple ktlint versions embedded).

- ktlint "**/*.kt" "**/*.kts" "!**/build/generated/**" "!**/build/kspCaches/**"

analysis:android-lint:
tags: [ "runner:main" ]
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/com/datadog/gradle/config/FlavorBuildConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ fun configureFlavorForSampleApp(flavor: ApplicationProductFlavor, rootDir: File)
"\"${config.applicationKey}\""
)
flavor.buildConfigField(
"String",
"DD_SITE_NAME",
"\"${flavor.name.toUpperCase(Locale.US)}\""
"String",
"DD_SITE_NAME",
"\"${flavor.name.toUpperCase(Locale.US)}\""
)
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/config/KotlinConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
package com.datadog.gradle.config

import com.android.build.gradle.tasks.factory.AndroidUnitTest
import java.io.File
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.File

fun Project.kotlinConfig(evaluateWarningsAsErrors: Boolean = true) {

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/apisurface/ApiSurfacePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
package com.datadog.gradle.plugin.apisurface

import com.datadog.gradle.config.taskConfig
import java.io.File
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.File

class ApiSurfacePlugin : Plugin<Project> {

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/apisurface/CheckApiSurfaceTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
package com.datadog.gradle.plugin.apisurface

import com.datadog.gradle.utils.execShell
import java.io.File
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.TaskAction
import java.io.File

open class CheckApiSurfaceTask : DefaultTask() {

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/apisurface/GenerateApiSurfaceTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

package com.datadog.gradle.plugin.apisurface

import java.io.File
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction
import java.io.File

open class GenerateApiSurfaceTask : DefaultTask() {
@get:InputDirectory
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/apisurface/KotlinFileVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

package com.datadog.gradle.plugin.apisurface

import java.io.File
import kotlinx.ast.common.AstSource
import kotlinx.ast.common.ast.Ast
import kotlinx.ast.common.ast.AstNode
import kotlinx.ast.common.ast.AstTerminal
import kotlinx.ast.common.print
import kotlinx.ast.grammar.kotlin.target.antlr.kotlin.KotlinGrammarAntlrKotlinParser
import java.io.File

class KotlinFileVisitor {

Expand Down
2 changes: 1 addition & 1 deletion ...rc/src/main/kotlin/com/datadog/gradle/plugin/checklicenses/CheckThirdPartyLicensesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

package com.datadog.gradle.plugin.checklicenses

import java.io.File
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.TaskAction
import java.io.File

open class CheckThirdPartyLicensesTask : DefaultTask() {

Expand Down
2 changes: 1 addition & 1 deletion ...rc/src/main/kotlin/com/datadog/gradle/plugin/checklicenses/DependenciesLicenseProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package com.datadog.gradle.plugin.checklicenses

import com.datadog.gradle.utils.asSequence
import javax.xml.parsers.DocumentBuilderFactory
import org.gradle.api.Project
import org.gradle.api.artifacts.component.ComponentIdentifier
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
Expand All @@ -18,6 +17,7 @@ import org.gradle.maven.MavenModule
import org.gradle.maven.MavenPomArtifact
import org.slf4j.LoggerFactory
import org.w3c.dom.Document
import javax.xml.parsers.DocumentBuilderFactory

class DependenciesLicenseProvider {

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/checklicenses/ThirdPartyLicensesPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
package com.datadog.gradle.plugin.checklicenses

import com.android.build.gradle.internal.tasks.factory.dependsOn
import java.io.File
import org.gradle.api.Plugin
import org.gradle.api.Project
import java.io.File

class ThirdPartyLicensesPlugin : Plugin<Project> {

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/com/datadog/gradle/plugin/gitclone/GitCloneDependenciesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
package com.datadog.gradle.plugin.gitclone

import com.datadog.gradle.utils.execShell
import java.io.File
import java.nio.file.Files.createTempDirectory
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.TaskAction
import java.io.File
import java.nio.file.Files.createTempDirectory

open class GitCloneDependenciesTask : DefaultTask() {

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/GenerateJsonSchemaTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package com.datadog.gradle.plugin.jsonschema

import com.datadog.gradle.plugin.jsonschema.generator.FileGenerator
import java.io.File
import org.gradle.api.DefaultTask
import org.gradle.api.Task
import org.gradle.api.tasks.CacheableTask
Expand All @@ -17,6 +16,7 @@ import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.PathSensitive
import org.gradle.api.tasks.PathSensitivity
import org.gradle.api.tasks.TaskAction
import java.io.File

// TODO test all from https://github.com/json-schema-org/JSON-Schema-Test-Suite/tree/master/tests/draft2019-09

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/JsonDefinitionReference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package com.datadog.gradle.plugin.jsonschema

import java.io.File

data class JsonDefinitionReference (
data class JsonDefinitionReference(
val typeName: String,
val definition: JsonDefinition,
val fromFile: File
)
)
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/JsonSchemaReader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package com.datadog.gradle.plugin.jsonschema

import com.datadog.gradle.utils.toCamelCase
import com.google.gson.Gson
import java.io.File
import org.gradle.api.logging.Logger
import java.io.File

class JsonSchemaReader(
private val nameMapping: Map<String, String>,
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/PokoExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ internal fun JsonPrimitiveType?.asKotlinTypeName(): TypeName {
}
}

internal fun TypeName.asNullable() = copy(nullable = true)
internal fun TypeName.asNullable() = copy(nullable = true)
2 changes: 1 addition & 1 deletion .../main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/ClassDeserializerGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,4 +379,4 @@ class ClassDeserializerGenerator(
ClassNameRef.NullPointerException
)
}
}
}
11 changes: 4 additions & 7 deletions buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/ClassGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import com.datadog.gradle.plugin.jsonschema.TypeProperty
import com.datadog.gradle.plugin.jsonschema.variableName
import com.squareup.kotlinpoet.ANY
import com.squareup.kotlinpoet.ARRAY
import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.CodeBlock
import com.squareup.kotlinpoet.FunSpec
import com.squareup.kotlinpoet.KModifier
Expand Down Expand Up @@ -44,7 +43,7 @@ class ClassGenerator(
): TypeSpec.Builder {
val typeBuilder = TypeSpec.classBuilder(definition.name)

if (definition.parentType != null){
if (definition.parentType != null) {
typeBuilder.superclass(definition.parentType.asKotlinTypeName(rootTypeName))
}

Expand Down Expand Up @@ -110,7 +109,7 @@ class ClassGenerator(
val funBuilder = FunSpec.builder(Identifier.FUN_TO_JSON)
.returns(ClassNameRef.JsonElement)

if (definition.parentType != null){
if (definition.parentType != null) {
funBuilder.addModifiers(KModifier.OVERRIDE)
}

Expand Down Expand Up @@ -158,7 +157,7 @@ class ClassGenerator(
is TypeDefinition.Null -> appendNullSerialization(property)
is TypeDefinition.Array -> appendArraySerialization(property, property.type, refName)
is TypeDefinition.Class,
is TypeDefinition.OneOfClass,
is TypeDefinition.OneOfClass,
is TypeDefinition.Enum -> appendTypeSerialization(property, refName)
}

Expand Down Expand Up @@ -374,7 +373,6 @@ class ClassGenerator(
else -> throw IllegalStateException(
"Unable to get Kotlin Value from $value with type $type"
)

}
}

Expand Down Expand Up @@ -453,5 +451,4 @@ class ClassGenerator(
}

// endregion

}
}
2 changes: 1 addition & 1 deletion ...dSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/EnumClassGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@ class EnumClassGenerator(
}

// endregion
}
}
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/FileGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import com.datadog.gradle.plugin.jsonschema.TypeDefinition
import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.FileSpec
import com.squareup.kotlinpoet.TypeSpec
import java.io.File
import org.gradle.api.logging.Logger
import java.io.File

class FileGenerator(
private val outputDir: File,
Expand Down Expand Up @@ -104,4 +104,4 @@ class FileGenerator(
else -> throw IllegalArgumentException("Can't generate a file for type $definition")
}
}
}
}
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/Identifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package com.datadog.gradle.plugin.jsonschema.generator

object Identifier{
object Identifier {

const val FUN_TO_JSON = "toJson"
const val FUN_TO_JSON_ELT = "toJsonElement"
Expand All @@ -25,4 +25,4 @@ object Identifier{
const val CAUGHT_EXCEPTION = "e"

const val PACKAGE_UTILS = "com.datadog.android.core.internal.utils"
}
}
3 changes: 1 addition & 2 deletions ...Src/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/KotlinSpecGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,4 @@ abstract class KotlinSpecGenerator<I : Any, O : Any>(
}

// endregion

}
}
3 changes: 1 addition & 2 deletions buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/KotlinTypeWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package com.datadog.gradle.plugin.jsonschema.generator

import com.datadog.gradle.plugin.jsonschema.TypeDefinition
import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.TypeName

data class KotlinTypeWrapper(
Expand All @@ -16,4 +15,4 @@ data class KotlinTypeWrapper(
val type: TypeDefinition
) {
var written: Boolean = false
}
}
3 changes: 1 addition & 2 deletions ...Src/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/MultiClassGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ class MultiClassGenerator(
return typeBuilder
}


// endregion

// region Internal
Expand Down Expand Up @@ -141,4 +140,4 @@ class MultiClassGenerator(
companion object {
private const val PARSE_ERROR_MSG = "Unable to parse json into one of type"
}
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/TypeSpecGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ abstract class TypeSpecGenerator<T : TypeDefinition>(
) : KotlinSpecGenerator<T, TypeSpec.Builder>(
packageName,
knownTypes
)
)
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/transdeps/TransitiveDependenciesPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
package com.datadog.gradle.plugin.transdeps

import com.datadog.gradle.config.taskConfig
import java.io.File
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.File

class TransitiveDependenciesPlugin : Plugin<Project> {

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/plugin/transdeps/TransitiveDependenciesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

package com.datadog.gradle.plugin.transdeps

import java.io.File
import org.gradle.api.DefaultTask
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.ProjectDependency
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction
import java.io.File

open class TransitiveDependenciesTask : DefaultTask() {

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/utils/NodeListSequence.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

package com.datadog.gradle.utils

import kotlin.collections.Iterator as KIterator
import org.w3c.dom.Node
import org.w3c.dom.NodeList
import kotlin.collections.Iterator as KIterator

class NodeListSequence(
private val nodeList: NodeList
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/datadog/gradle/utils/SystemUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

package com.datadog.gradle.utils

import org.gradle.api.Project
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.InputStreamReader
import org.gradle.api.Project

fun Project.execShell(vararg command: String): List<String> {
val outputStream = ByteArrayOutputStream()
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/test/kotlin/com/datadog/android/core/internal/utils/MiscUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.core.`internal`.utils
package com.datadog.android.core.`internal`.utils

import com.google.gson.JsonArray
import com.google.gson.JsonElement
Expand Down
Loading