Kotlin Gradle scripts. Part 1 of 2 by dmdashenkov · Pull Request #532 · SpineEventEngine/base-libraries

dmdashenkov · 2020-05-08T13:11:53Z

In this PR we start migrating our Gradle scripts to Kotlin.

For simplicity, we split the changes into 2 PRs. In this PR we migrate the basic scripts of the repo's main build. Other builds (smoke-tests and base-validating-builders) are to be migrated in the next part.

codecov · 2020-05-08T14:45:03Z

Codecov Report

Merging #532 into master will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master     #532   +/-   ##
=========================================
  Coverage     73.70%   73.70%           
  Complexity     2930     2930           
=========================================
  Files           503      503           
  Lines         11873    11873           
  Branches        665      665           
=========================================
  Hits           8751     8751           
  Misses         2902     2902           
  Partials        220      220

…ugin` blocks

dmdashenkov · 2020-05-18T10:26:05Z

@armiol, @alexander-yevsyukov, PTAL.

armiol

@dmdashenkov mostly LGMT. Please see my comments.

armiol · 2020-05-18T11:41:58Z

buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt

+    )
+    @Deprecated("Use Flogger over SLF4J.",
+                replaceWith = ReplaceWith("Deps.runtime.floggerSystemBackend"))
+    @Suppress("DEPRECATION")


I don't understand this suppression. Can you please have a comment?

armiol · 2020-05-18T11:43:07Z

tools/errorprone-checks/build.gradle.kts

-    testImplementation deps.build.errorProneTestHelpers
+    annotationProcessor(Deps.build.autoService.processor)
+    compileOnly(Deps.build.autoService.annotations)
+    implementation(project(":base"))


This one reads better than "implementation" in build.gradle.kt above, i.e.

"implementation"(Deps.build.guava) "implementation"(Deps.build.checkerAnnotations) "implementation"(Deps.build.jsr305Annotations)

It is possible to use no-quote syntax there as well?

armiol · 2020-05-18T11:46:02Z

tools/plugin-base/build.gradle.kts

+sourceSets.test {
+    resources.srcDir("$projectDir/src/test/resources")
+}
+


Please kill these redundant empty lines.

alexander-yevsyukov

Please see my comments and questions.

alexander-yevsyukov · 2020-05-18T11:24:29Z

.travis.yml

    # Encrypted `GCS_SECRET` variable.
    - secure: "i8MhONZu7QjyM2V887A1Tydr1WMqQP5jJZNjIJjc1Uae8F0/z8cJZIZ1hstodN7FpoR4VF92zyhUwbt6fz/dsdPEJFccsiMlEc9vlqecQCd267160wgRZneaB6Xe/y/EUmq9XsGdn/k1Ey+QZwX9au/8RU191v+fDsCtMRYXzyEa/BvbQuSwuYRgQDxTAxuJgTmG5Sxl9jWqKw1BfxUcEoErc/jqymU58w6z2TxKxVzIXT29Jy/Z12VuSiS8opigSrIP8e/1fctC84wI7S52mext2ZfhPYSTHFKS+xg1vQDYPb8m5aomL8E6Of7hVD5BTnEnyjj+/Gr63GAzHXtkHhWoxo+vB+xBFfDu8wxM5Aqna3H7LMDD5kGCxQEz8qmzHBHMAhLnhsRzjNVu2+tLCZdeMN88Ud2uemL2SCAcR8Juleg7DGMj3D0SAbPyUH3+9yYYWzSg6iaxgTdHBnJ+uXUJp0Nu+M2EK6Kl+pYAsCLVfZRPGaajFXVnJEPPeSr2PYzk7F4pIzgn/E8AtYEJ0gcEbjoTItS8EjliJKDXM4HdkluXBFLvzIH1O1nCtxKNv4UkUmPhFbfHrPXDcsYq2zsEe+NkvsJlxjAwYnOMkT4NLiEsec1a7K9bBC+iQA9e8rriMbu6/1w63JErQyx05avPjgO8XRDK8hxTf4rhBmY="
    - GRADLE_OPTS="-Xmx2G"
+    # TODO:2020-05-18:dmytro.dashenkov: Remove there 2 lines when Travis stops failing when installing JDK 8.


there -> these?

alexander-yevsyukov · 2020-05-18T11:37:11Z

base/build.gradle.kts

+
+configurations {
+    // Avoid collisions of Java classes defined both in `protobuf-lite` and `protobuf-java`
+    runtimeClasspath.get().exclude(group = "com.google.protobuf", module = "protobuf-lite")


Can we have these constants extracted into final variables?

alexander-yevsyukov · 2020-05-18T11:41:06Z

base/build.gradle.kts

+/**
+ * Checks if the given file belongs to the Google `.proto` sources.
+ */
+fun isGoogleProtoSource(file: FileTreeElement): Boolean {


Is it possible to do the following in this context:

fun FileTreeElement.isGoogleProtoSource(): Boolean { ... }

alexander-yevsyukov · 2020-05-18T11:42:49Z

build.gradle.kts

+        from("$rootDir/config/gradle/dependencies.gradle")
+    }
+    version = rootProject.extra["versionToPublish"]!!
+    version = rootProject.extra["versionToPublish"]!!


Why do we need this twice?

alexander-yevsyukov · 2020-05-18T11:46:00Z

build.gradle.kts

+        Deps.build.protobuf.forEach { "api"(it) }
+        "api"(Deps.build.flogger)
+        "implementation"(Deps.build.guava)
+        "implementation"(Deps.build.checkerAnnotations)


Are there calls that allow to say implementation only once, accepting a list of dependencies?

alexander-yevsyukov · 2020-05-18T11:47:11Z

build.gradle.kts

+
+    DependencyResolution.forceConfiguration(configurations)
+    configurations {
+        named("runtime").get().exclude(group = "com.google.protobuf", module = "protobuf-lite")


I think this becomes a “reusable code”. Can we extract it somehow?

testlib/build.gradle.kts

alexander-yevsyukov

LGTM

dmdashenkov added 5 commits May 5, 2020 14:48

Translate settings.gradle into Kotlin

dc9d945

Translate version.gradle into Kotlin

207f593

Update Gradle

72ab492

Update config

44c33e4

Translate root build.gradle into Kotlin and stage Deps object

57c171b

dmdashenkov self-assigned this May 8, 2020

dmdashenkov added 2 commits May 8, 2020 16:13

Make version.gradle.kts prettier

2d1f833

Extract RunBuild as a task class

771b67d

dmdashenkov added 14 commits May 11, 2020 13:44

Document RunBuild task

17f5781

Use Gradle all distro for debug purposes

340a48e

Update config

ec40086

Use RunBuild instead of run-build.gradle

c13f231

Translate base/build.gradle into Kotlin

2481505

Use type-safe accessors

f8932ea

Translate some build.gradle files into Kotlin

25845e4

Use type-safe accessors

9a65a52

Translate build.gradle files into Kotlin and remove unnecessary `pl…

663d8dd

…ugin` blocks

Update config

e6238b9

Update config

3e5a802

Update config

ac2c47e

Clean up

c3d948c

Update config

3807949

dmdashenkov changed the title ~~Kotlin Gradle scripts~~ Kotlin Gradle scripts. Part 1 of 2 May 18, 2020

dmdashenkov added 4 commits May 18, 2020 12:08

Use bin Gradle distro

051f6ee

Update Gradle

69f96a2

Manually add path to JDK 8 to $PATH

6ba5569

Add a TODO

0068cb3

dmdashenkov marked this pull request as ready for review May 18, 2020 10:25

dmdashenkov requested a review from alexander-yevsyukov May 18, 2020 10:25

dmdashenkov requested a review from armiol May 18, 2020 10:25

armiol reviewed May 18, 2020

View reviewed changes

alexander-yevsyukov requested changes May 18, 2020

View reviewed changes

dmdashenkov added 2 commits May 18, 2020 15:23

Use type-safe accessors

548886a

Remove empty lines

a87f8bb

dmdashenkov mentioned this pull request May 18, 2020

Comment suppressions SpineEventEngine/config#114

Merged

dmdashenkov added 4 commits May 18, 2020 16:28

Update config

71febad

Fix a typo

19bc1ad

Fix a typo

5c21405

Clean up a build script

5425745

alexander-yevsyukov approved these changes May 18, 2020

View reviewed changes

Update config

45db098

dmdashenkov merged commit 2d5b632 into master May 18, 2020

dmdashenkov deleted the kotlin-gradle-scripts branch May 18, 2020 14:31

yuri-sergiichuk mentioned this pull request May 26, 2020

Plugin is not compatible with Gradle 6.4 SpineEventEngine/bootstrap#49

Closed

dmitrykuzmin mentioned this pull request Sep 8, 2020

Release 1.6.0 #565

Merged

Conversation

dmdashenkov commented May 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented May 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dmdashenkov commented May 18, 2020

Uh oh!

armiol left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexander-yevsyukov left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alexander-yevsyukov left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dmdashenkov commented May 8, 2020 •

edited

Loading

codecov bot commented May 8, 2020 •

edited

Loading