Skip to content

Commit cc7e954

Browse files
Merge pull request #8 from rundeck-plugins/RUN-3223-clean
RUN-3223: Refactor plugin to improve performance
2 parents 7339a13 + 042a6dd commit cc7e954

12 files changed

Lines changed: 4780 additions & 1028 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
.gradle
33
build
44
**/.DS_Store
5-
.vscode
5+
.vscode
6+
node_modules
7+
coverage

build.gradle

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ buildscript {
44
maven { url "https://repo.grails.org/grails/core" }
55
}
66
dependencies {
7-
classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:2.11.6'
7+
classpath libs.assetPipeline
88
}
99
}
1010

1111
plugins {
12-
id 'pl.allegro.tech.build.axion-release' version '1.7.0'
12+
alias(libs.plugins.axionRelease)
1313
id 'java'
1414
}
1515

@@ -20,8 +20,8 @@ repositories {
2020
maven { url "https://repo.grails.org/grails/core" }
2121
}
2222

23-
sourceCompatibility = 1.11
24-
targetCompatibility = 1.11
23+
sourceCompatibility = 11
24+
targetCompatibility = 11
2525

2626
println "Java Home: ${System.getProperty('java.home')}"
2727
println "Java Version: ${System.getProperty('java.version')}"
@@ -42,15 +42,8 @@ scmVersion {
4242
tag {
4343
prefix = ''
4444
versionSeparator = ''
45-
def origDeserialize=deserialize
46-
deserialize = { config, position, tagName ->
47-
def orig = origDeserialize(config, position, tagName)
48-
if (orig.split('\\.').length < 3) {
49-
orig += ".0"
50-
}
51-
orig
52-
}
5345
}
46+
versionCreator('simple')
5447
}
5548

5649
project.version = scmVersion.version
@@ -76,6 +69,14 @@ assets {
7669
compileDir = "${project.buildDir}/assets/resources"
7770
}
7871

72+
task createMissingDirectories {
73+
doFirst {
74+
mkdir("${project.projectDir}/src/assets")
75+
}
76+
}
77+
78+
assetCompile.dependsOn createMissingDirectories
79+
7980
defaultTasks 'build'
8081

8182
task pluginZip(type: Jar) {
@@ -132,7 +133,7 @@ project.pluginZip.dependsOn assetCompile
132133
project.pluginZip.mustRunAfter assetCompile
133134

134135
dependencies {
135-
implementation 'com.bertramlabs.plugins:sass-asset-pipeline:2.11.6'
136+
implementation libs.sassAssetPipeline
136137
}
137138

138139
artifacts {

gradle/libs.versions.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[versions]
2+
asset-pipeline = "3.4.0"
3+
sass-asset-pipeline = "3.4.0"
4+
axion-release = "1.18.12"
5+
6+
[libraries]
7+
assetPipeline = { module = "com.bertramlabs.plugins:asset-pipeline-gradle", version.ref = "asset-pipeline" }
8+
sassAssetPipeline = { module = "com.bertramlabs.plugins:sass-asset-pipeline", version.ref = "sass-asset-pipeline" }
9+
10+
[plugins]
11+
axionRelease = { id = "pl.allegro.tech.build.axion-release", version.ref = "axion-release" }
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
4+
validateDistributionUrl=true
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = 'ui-roi-summary'

0 commit comments

Comments
 (0)