-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
main
Choose a base branch
from
SPRINT-14393
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 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 2bb9c88
SPRINT-14393 gradle update, kts, kotlin - test fix
mimoccc 54c2073
SPRINT-14393 gradle update, kts, kotlin - vesioning fix
mimoccc dff3762
SPRINT-14393 gradle update, kts, kotlin - vesioning fix
mimoccc 0059d4a
SPRINT-14393 gradle update, kts, kotlin - gradle version top up
mimoccc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,3 +50,4 @@ Thumbs.db | |
|
|
||
| /.gradle/ | ||
| /build/ | ||
| /local.properties | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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=""com.nordija.PluginTest.testGitMavenVersion"" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>true</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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=""com.nordija.PluginTest.testGitVersion"" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>true</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"]) | ||
| } | ||
| } | ||
| } | ||
| // ------------------------------------------------------------------------------------------------- |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.11.1-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
8.13
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. I will change it to 8.13.
I dont think is so much diferrent, unsure why we have two plugins.
There is just change in, hot branch is found, i think.
And does not have such as properties exported as maven one.