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

Build scripts updated and refactored #225

Merged
merged 9 commits into from
Jan 17, 2020
Merged

Conversation

szymon-owczarzak
Copy link
Contributor

Just an update and refactor - no functional changes.


I hereby agree to the terms of the Cogboard Contributor License Agreement.

url = uri("https://plugins.gradle.org/m2")
url = uri("http://dl.bintray.com/cognifide/maven-public")
url = uri("https://dl.bintray.com/neva-dev/maven-public")
}
}

dependencies {
implementation("com.moowork.gradle:gradle-node-plugin:1.2.0")
Copy link
Contributor Author

@szymon-owczarzak szymon-owczarzak Jan 16, 2020

Choose a reason for hiding this comment

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

Updating node causes a lot of problems... i left it un-updated

}

dependencies {
implementation("com.moowork.gradle:gradle-node-plugin:1.2.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31")
implementation("com.bmuschko:gradle-docker-plugin:4.10.0")
implementation("net.researchgate:gradle-release:2.6.0")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

gradle-release No longer in use

@@ -43,7 +43,7 @@ class BoardsAndWidgetsController : AbstractVerticle() {

private fun prepareConfig() = mapOf<String, (JsonObject) -> String>(
"update" to { body -> update(body) },
"get" to { body -> boardsConfigService.loadBoardsConfig().toString() }
"get" to { _ -> boardsConfigService.loadBoardsConfig().toString() }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Detekt fix


tasks {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

task registration is now grouped in { ... }

Comment on lines -134 to -137
tasks.register<Exec>("copyCypressContent") {
group = "docker-functional-tests"
commandLine = listOf("sh", "scripts/copyCypressContent.sh", "$cypressContentPath", "$mountDir")
mustRunAfter("redeployLocal")
Copy link
Contributor Author

@szymon-owczarzak szymon-owczarzak Jan 16, 2020

Choose a reason for hiding this comment

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

@staszke - We have better approach for copying files - lets use the old way without unnecessary script that will not work when you don't have shell sh installed on your system.

Comment on lines +9 to +13
maven {
url = uri("https://plugins.gradle.org/m2")
url = uri("http://dl.bintray.com/cognifide/maven-public")
url = uri("https://dl.bintray.com/neva-dev/maven-public")
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

lets group them together

Copy link
Contributor

@marcinkp marcinkp left a comment

Choose a reason for hiding this comment

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

Nice

@jplucinski jplucinski self-requested a review January 16, 2020 14:58
Copy link
Contributor

@jplucinski jplucinski left a comment

Choose a reason for hiding this comment

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

Good job!

@szymon-owczarzak szymon-owczarzak merged commit 5dc739f into master Jan 17, 2020
@szymon-owczarzak szymon-owczarzak deleted the build-script-update branch January 17, 2020 07:03
@szymon-owczarzak szymon-owczarzak added the maintenance documentation, refactoring, releasing etc... label Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance documentation, refactoring, releasing etc...
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants