Skip to content

SPRINT-14393 Upgrade to kotlin & kts & update #2

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

Open
milan-jurkulak wants to merge 5 commits into
base: main
Choose a base branch
from
Open

SPRINT-14393 Upgrade to kotlin & kts & update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ce1cfc
SPRINT-14393 Upgrade to kotlin & kts & update
mimoccc Apr 7, 2025
2bb9c88
SPRINT-14393 gradle update, kts, kotlin - test fix
mimoccc Apr 8, 2025
54c2073
SPRINT-14393 gradle update, kts, kotlin - vesioning fix
mimoccc Apr 9, 2025
dff3762
SPRINT-14393 gradle update, kts, kotlin - vesioning fix
mimoccc Apr 9, 2025
0059d4a
SPRINT-14393 gradle update, kts, kotlin - gradle version top up
mimoccc Apr 10, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ Thumbs.db

/.gradle/
/build/
/local.properties
24 changes: 24 additions & 0 deletions .run/publishToMavenLocal.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="publishToMavenLocal" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="publishToMavenLocal" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
26 changes: 26 additions & 0 deletions .run/testGitMavenVersion.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="testGitMavenVersion" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;com.nordija.PluginTest.testGitMavenVersion&quot;" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
</component>
26 changes: 26 additions & 0 deletions .run/testGitVersion.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="testGitVersion" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;com.nordija.PluginTest.testGitVersion&quot;" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
</component>
71 changes: 0 additions & 71 deletions build.gradle
View file
Open in desktop

This file was deleted.

75 changes: 75 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import com.nordija.VersionManagerPlugin
// -------------------------------------------------------------------------------------------------
buildscript {
dependencies {
classpath("com.nordija:gitMavenVersioning:2.2.+")
classpath("org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0")
}
}
// -------------------------------------------------------------------------------------------------
plugins {
`kotlin-dsl`
`maven-publish`
`java-gradle-plugin`
id("com.jfrog.artifactory") version ("4.33.1")
}
kotlin {
jvmToolchain(17)
}
dependencies {
implementation(gradleApi())
implementation(localGroovy())
implementation(gradleKotlinDsl())
testImplementation("junit:junit:4.11")
}
// -------------------------------------------------------------------------------------------------
plugins.apply (VersionManagerPlugin::class)
// -------------------------------------------------------------------------------------------------
val pluginGroup = "com.24i"
val pluginVersion = "1.1.2"
val pluginName = "gitVersion"
val pluginDescription = "Versioning plugin 24i"
// -------------------------------------------------------------------------------------------------
val pluginId = "$pluginGroup.$pluginName"
val pluginClass = "com._24i.VersionManagerPlugin"
val userName = project.property("gradleUsername") as String
val password = project.property("gradlePassword") as String
// -------------------------------------------------------------------------------------------------
group = pluginGroup
version = pluginVersion
// -------------------------------------------------------------------------------------------------
gradlePlugin {
plugins {
register(pluginName) {
id = pluginId
implementationClass = pluginClass
displayName = pluginName
description = pluginDescription
}
}
}
// -------------------------------------------------------------------------------------------------
artifactory {
setContextUrl("https://aminocom2.jfrog.io/artifactory/")
publish {
repository {
setRepoKey("fokuson-public-release-local")
setUsername(userName)
setPassword(password)
setMavenCompatible(true)
setVersion(pluginVersion)
}
defaults {
publications("mavenJava")
}
}
}
// -------------------------------------------------------------------------------------------------
publishing {
publications {
create<MavenPublication>("mavenJava") {
from(components["java"])
}
}
}
// -------------------------------------------------------------------------------------------------
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion settings.gradle
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
pluginManagement {
repositories {
mavenLocal()
mavenCentral()
gradlePluginPortal()
maven("https://aminocom2.jfrog.io/artifactory/FokusOnCentral") {
val gradleUsername: String by settings
val gradlePassword: String by settings
credentials {
username = gradleUsername
password = gradlePassword
}
}
}
}

dependencyResolutionManagement {
repositories {
mavenLocal()
mavenCentral()
gradlePluginPortal()
maven("https://aminocom2.jfrog.io/artifactory/FokusOnCentral") {
val gradleUsername: String by settings
val gradlePassword: String by settings
credentials {
username = gradleUsername
password = gradlePassword
}
}
}
}

rootProject.name = "gitVersion"
64 changes: 0 additions & 64 deletions src/main/groovy/com/_24i/VersionManagerPlugin.groovy
View file
Open in desktop

This file was deleted.

Loading