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.

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

Use version catalog in buildSrc code #1007

Merged
merged 1 commit into from
Jul 29, 2022

Conversation

PawelLipski
Copy link
Collaborator

No description provided.

@PawelLipski PawelLipski self-assigned this Jul 28, 2022
@PawelLipski PawelLipski requested a review from MaciejG604 July 28, 2022 17:57
@PawelLipski PawelLipski added this to the v2.2.0 milestone Jul 28, 2022
@PawelLipski PawelLipski linked an issue Jul 28, 2022 that may be closed by this pull request
17 tasks
@@ -1,7 +1,6 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
`java-library`
Copy link
Collaborator

Choose a reason for hiding this comment

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

image

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Was redundant!

dependencyResolutionManagement {
versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }
versionCatalogs {
create("libs") {
Copy link
Collaborator

Choose a reason for hiding this comment

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

so we were not using it b4 although the catalog was present, right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, exactly, there were only hardcoded references to libs in buildSrc kotlin code

@@ -92,70 +106,71 @@ object BuildUtils {

project.dependencies {
add("uiTestImplementation", testFixtures(project(":testCommon")))
add("uiTestImplementation", "org.virtuslab.ideprobe:junit-driver_2.13:0.36.1")
add("uiTestImplementation", "org.virtuslab.ideprobe:robot-driver_2.13:0.36.1")
add("uiTestImplementation", project.bundle("ideProbe"))
Copy link
Collaborator

Choose a reason for hiding this comment

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

nice. finally it look like człowiek

import org.checkerframework.gradle.plugin.CheckerFrameworkExtension
import org.checkerframework.gradle.plugin.CheckerFrameworkPlugin
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.tasks.SourceSet
import org.gradle.kotlin.dsl.*

// TODO (#1004): Remove hardcoded dependencies and deprecated code
// TODO (#1004): Remove deprecated code
Copy link
Collaborator

Choose a reason for hiding this comment

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

one check box resolved 😌

@PawelLipski PawelLipski changed the title Use version catalog from buildSrc code Use version catalog in buildSrc code Jul 28, 2022
@PawelLipski PawelLipski force-pushed the refactor/version-catalog-from-buildsrc branch from a455eba to 80534c5 Compare July 29, 2022 09:21
@PawelLipski PawelLipski merged commit 80534c5 into develop Jul 29, 2022
@PawelLipski PawelLipski deleted the refactor/version-catalog-from-buildsrc branch July 29, 2022 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve Gradle-related Kotlin code
3 participants