Skip to content

Commit f7d69e5

Browse files
Merge pull request #225 from ie3-institute/rel/sp/#224-release-0.3
Release 0.3
2 parents 20633eb + 8577380 commit f7d69e5

File tree

7 files changed

+45
-33
lines changed

7 files changed

+45
-33
lines changed

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased / Snapshot]
88

9+
## [0.3]
10+
911
### Added
1012
- Added Bao and Staudt to list of reviewers [#188](https://github.com/ie3-institute/powerflow/issues/188)
1113
- Added semantic Versioning plugin to gradle [#218](https://github.com/ie3-institute/powerflow/issues/218)
1214

1315
## Removed
1416
- Removed dependency constraint [#221](https://github.com/ie3-institute/powerflow/issues/221)
1517

16-
### Changed
18+
### Updates
1719
- Upgraded to `scala3` [#204](https://github.com/ie3-institute/powerflow/issues/204)
20+
- Bumping gradle to 8.14
1821

1922
## [0.2]
2023

@@ -36,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3639
### Removed
3740
- Spock testing framework
3841

39-
[Unreleased / Snapshot]: https://github.com/ie3-institute/powerflow/compare/0.2...HEAD
42+
[Unreleased / Snapshot]: https://github.com/ie3-institute/powerflow/compare/0.3...HEAD
43+
[0.3]: https://github.com/ie3-institute/powerflow/compare/0.2...0.3
4044
[0.2]: https://github.com/ie3-institute/powerflow/compare/0.1...0.2
4145
[0.1]: https://github.com/ie3-institute/powerflow/releases/tag/0.1

gradle/scripts/mavenCentralPublish.gradle

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
/* Maven publish - start */
2-
task sourcesJar(type: Jar) {
2+
3+
tasks.register("sourcesJar", Jar) {
34
archiveClassifier.set("sources")
4-
from sourceSets.main.allSource
5+
from sourceSets.main.allJava
56
}
67

7-
task javadocJar(type: Jar, dependsOn: javadoc) {
8+
tasks.register("javadocJar", Jar) {
9+
dependsOn tasks.named("javadoc", Javadoc)
810
archiveClassifier.set("javadoc")
9-
from javadoc.destinationDir
11+
from { tasks.named("javadoc", Javadoc).get().destinationDir }
1012
}
1113

14+
if (project.hasProperty('user') && project.hasProperty('password') && project.hasProperty('deployVersion')) {
1215

13-
if (project.hasProperty('user') && project.hasProperty('password')) {
16+
// snapshot version differs from normal version
17+
String versionString = project.getProperty('deployVersion')
1418

15-
signing {
16-
required { !version.endsWith('SNAPSHOT') }
17-
if (required)
18-
sign(publishing.publications)
19-
}
2019

2120
publishing {
2221
publications {
23-
mavenJava(MavenPublication) {
22+
create("mavenJava", MavenPublication) {
2423

2524
versionMapping {
2625
// resolves dynamic versioning to current version number
@@ -37,7 +36,7 @@ if (project.hasProperty('user') && project.hasProperty('password')) {
3736
url = 'https:github.com/ie3-institute/powerflow'
3837
organization {
3938
name = 'Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)/TU Dortmund University'
40-
url = 'http:www.ie3.tu-dortmund.de/'
39+
url = 'https:www.ie3.tu-dortmund.de/'
4140
}
4241
issueManagement {
4342
system = 'GitHub'
@@ -63,38 +62,41 @@ if (project.hasProperty('user') && project.hasProperty('password')) {
6362
}
6463

6564
removeTestDependenciesFromPom(pom)
66-
groupId project.getProperty('group')
67-
artifactId 'powerflow'
68-
version project.getProperty('version')
65+
groupId = group
66+
artifactId = 'powerflow'
67+
version = versionString
6968

7069
from components.java
71-
artifact sourcesJar
72-
artifact javadocJar
70+
artifact tasks.named("sourcesJar")
71+
artifact tasks.named("javadocJar")
7372
}
7473
}
7574
repositories {
7675
maven {
7776
def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
7877
def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
79-
url = this.version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
78+
url = versionString.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
8079
credentials {
8180
username project.getProperty('user')
8281
password project.getProperty('password')
8382
}
8483
}
8584
}
85+
signing {
86+
useInMemoryPgpKeys(
87+
findProperty('signingKey') as String,
88+
findProperty('signingPassword') as String
89+
)
90+
sign publications.mavenJava
91+
}
8692
}
8793

88-
89-
model {
90-
tasks.generatePomFileForMavenJavaPublication {
91-
destination = file("${layout.buildDirectory.dir}/generated-pom.xml")
92-
}
94+
tasks.named("generatePomFileForMavenJavaPublication") {
95+
destination = layout.buildDirectory.file("generated-pom.xml").get().asFile
9396
}
9497
}
9598

9699
def removeTestDependenciesFromPom(pom) {
97-
98100
pom.withXml {
99101
def root = asNode()
100102
// eliminate test-scoped dependencies (no need in maven central POMs)
@@ -104,4 +106,4 @@ def removeTestDependenciesFromPom(pom) {
104106
}
105107
}
106108

107-
/* Maven publish - end */
109+
/* Maven publish - end */

gradle/wrapper/gradle-wrapper.jar

51 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

version.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#Generated by the Semver Plugin for Gradle
2+
#Fri May 09 11:13:49 CEST 2025
23
version.buildmeta=
3-
version.major=1
4-
version.minor=0
4+
version.major=0
5+
version.minor=3
56
version.patch=0
67
version.prerelease=
7-
version.semver=1.0.0
8+
version.semver=0.3.0

0 commit comments

Comments
 (0)