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

Upgrade to Gradle 7.2 #43

Merged
merged 48 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
1085a02
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
542ebe8
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
b105413
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
3c3fe02
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
dc2d9b9
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
74e336a
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
9793dc6
Merge remote-tracking branch 'origin/master' into feature/gradle-8
philipp94831 Feb 23, 2024
0dcd62c
Use new Sonatype host by default
philipp94831 Feb 23, 2024
9c35a8b
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
0a9d7f4
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
ac9cb32
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
f7371fe
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
1c2c6e7
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
b5bc9ee
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
6aa1335
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
39b833b
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
4a8b043
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
b2d7c1a
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
9a8aa85
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
86968de
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
ad2f602
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
84ceb83
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
bab1436
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
ca611cd
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
c17fc8c
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
c76527d
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
4c791fc
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
95cc940
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
3e667a9
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
99415f3
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
08afbcc
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
9b0eddd
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
5a02e72
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
8764056
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
733e6f7
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
d5e5997
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
ee33b2c
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
566738a
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
9a9a90a
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
18e18f7
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
78d8797
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
bd33527
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
dd96cfc
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
1f49fd2
Use Gradle Nexus Publish Plugin
philipp94831 Feb 26, 2024
cec0049
Merge remote-tracking branch 'origin/master' into feature/nexus-publish
philipp94831 Feb 27, 2024
af4d283
Upgrade to Gradle 7.2
philipp94831 Feb 27, 2024
271594a
Upgrade to Gradle 7.2
philipp94831 Feb 27, 2024
14d168f
Merge remote-tracking branch 'origin/master' into feature/gradle-7
philipp94831 Feb 27, 2024
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id("com.bakdata.sonar") version "1.1.17"
id("com.bakdata.sonatype") version "1.1.18"
id("org.hildan.github.changelog") version "1.13.1"
id("org.gradle.kotlin.kotlin-dsl") version "1.4.9" apply false
id("org.gradle.kotlin.kotlin-dsl") version "2.1.6" apply false
id("com.gradle.plugin-publish") version "1.2.1" apply false
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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-6.9.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions sonar/src/test/kotlin/com/bakdata/gradle/SonarPluginIT.kt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ internal class SonarPluginIT {
}
dependencies {
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.0")
testCompile("org.junit.jupiter:junit-jupiter-api:5.3.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.0")
}
tasks.withType<Test> {
useJUnitPlatform()
Expand Down Expand Up @@ -97,7 +97,7 @@ internal class SonarPluginIT {
}
dependencies {
"testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.3.0")
"testCompile"("org.junit.jupiter:junit-jupiter-api:5.3.0")
"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.3.0")
}
tasks.withType<Test> {
useJUnitPlatform()
Expand Down Expand Up @@ -132,4 +132,4 @@ internal class SonarPluginIT {
.haveExactly(1, taskWithPathAndOutcome(":sonarqube", TaskOutcome.SUCCESS))
}
}
}
}
5 changes: 5 additions & 0 deletions sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ class SonatypePlugin : Plugin<Project> {
username.set(getOverriddenSetting(SonatypeSettings::osshrUsername))
password.set(getOverriddenSetting(SonatypeSettings::osshrPassword))
getOverriddenSetting(SonatypeSettings::nexusUrl)?.let { nexusUrl.set(uri(it)) }
allowInsecureProtocol.set(getOverriddenSetting(SonatypeSettings::allowInsecureProtocol))
}
}
}
Expand Down Expand Up @@ -166,6 +167,10 @@ class SonatypePlugin : Plugin<Project> {
getOverriddenSetting(SonatypeSettings::connectTimeout)?.let {
nexus.connectTimeout.value(Duration.ofSeconds(it))
}

getOverriddenSetting(SonatypeSettings::allowInsecureProtocol)?.let {
nexus.repositories["nexus"].allowInsecureProtocol.value(it)
}
}
}
}
Expand Down
27 changes: 26 additions & 1 deletion sonatype/src/main/kotlin/com/bakdata/gradle/SonatypeSettings.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*
* The MIT License
*
* Copyright (c) 2024 bakdata GmbH
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package com.bakdata.gradle

import au.com.console.kassava.kotlinToString
Expand Down Expand Up @@ -29,10 +53,11 @@ open class SonatypeSettings(var project: Project) {
var developers: Action<in MavenPomDeveloperSpec>? = null
var connectTimeout: Long = 300
var clientTimeout: Long = 300
var allowInsecureProtocol: Boolean = false

fun developers(developerSpec: Action<in MavenPomDeveloperSpec>) {
this.developers = developerSpec
}

override fun toString() = kotlinToString(properties = SonatypeSettings::class.memberProperties.toTypedArray())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ internal class SonatypePluginIT {
}
}
nexusUrl = "${wiremock.baseUrl()}"
allowInsecureProtocol = true
}
""".trimIndent())

Expand Down Expand Up @@ -170,6 +171,7 @@ internal class SonatypePluginIT {
}
}
nexusUrl = "${wiremock.baseUrl()}"
allowInsecureProtocol = true
}

subprojects {
Expand Down
Loading