Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
guillermocalvo committed Jun 20, 2024
2 parents f60eec7 + 1cc4975 commit 8c560cc
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 8 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,25 @@ jobs:
- name: Check
run: ./gradlew check

# ================================
# SEMANTIC VERSIONING
# ================================
- name: Semantic versioning
if: ${{ matrix.jdk == 21 }}
run: |
SEMVER=`cat ./api-compatibility/build/semver.txt`
BADGE="https://dev.leakyabstractions.com/result/semver-${SEMVER}.json"
URL="https://img.shields.io/endpoint?url=$BADGE"
echo "## Compatibility Report" >> $GITHUB_STEP_SUMMARY
echo "![Semantic Versioning]($URL)" >> $GITHUB_STEP_SUMMARY
# ================================
# COMPATIBILITY REPORT
# ================================
- name: Compatibility with version ${{ steps.properties.outputs.previousVersion }}
if: ${{ matrix.jdk == 21 }}
run: cat ./api-compatibility/build/report.txt >> $GITHUB_STEP_SUMMARY
# $GITHUB_STEP_SUMMARY supports content up to a size of 1024k
run: head -c 1MiB ./api-compatibility/build/report.txt >> $GITHUB_STEP_SUMMARY

# ================================
# CACHE SONARCLOUD PACKAGES
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: github/codeql-action/init@v3
with:
languages: java-kotlin
build-mode: none
build-mode: autobuild

# ================================
# ANALYZE
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@ jobs:
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v3
env:
# Exclude all dependencies that originate solely in the 'api-compatibility' project
DEPENDENCY_GRAPH_EXCLUDE_PROJECTS: ':api-compatibility'
# Exclude dependencies that are only resolved in test classpaths
DEPENDENCY_GRAPH_EXCLUDE_CONFIGURATIONS: '.*[Tt]est(Compile|Runtime)Classpath'
2 changes: 2 additions & 0 deletions api-compatibility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ tasks.register("clean", Delete) {
}

tasks.register("check", me.champeau.gradle.japicmp.JapicmpTask) {
final semverReport= layout.buildDirectory.file('semver.txt').get().asFile
final textReport = layout.buildDirectory.file('report.txt').get().asFile
final htmlReport = layout.buildDirectory.file('report.html').get().asFile
newClasspath.from(configurations.current)
oldClasspath.from(configurations.previous)
semverOutputFile = semverReport
txtOutputFile = textReport
htmlOutputFile = htmlReport
onlyModified = true
Expand Down
9 changes: 9 additions & 0 deletions docs/semver-0.0.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"schemaVersion": 1,
"style": "for-the-badge",
"labelColor": "gray",
"color": "green",
"label": "semver",
"message": "OK",
"namedLogo": "semver"
}
9 changes: 9 additions & 0 deletions docs/semver-0.0.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"schemaVersion": 1,
"style": "for-the-badge",
"labelColor": "gray",
"color": "yellow",
"label": "semver",
"message": "PATCH",
"namedLogo": "semver"
}
9 changes: 9 additions & 0 deletions docs/semver-0.1.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"schemaVersion": 1,
"style": "for-the-badge",
"labelColor": "gray",
"color": "orange",
"label": "semver",
"message": "MINOR",
"namedLogo": "semver"
}
9 changes: 9 additions & 0 deletions docs/semver-1.0.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"schemaVersion": 1,
"style": "for-the-badge",
"labelColor": "gray",
"color": "red",
"label": "semver",
"message": "MAJOR",
"namedLogo": "semver"
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description = Result Library for Java
group = com.leakyabstractions
artifactName = Result Library
artifactId = result
version = 0.15.1.1
version = 0.15.2.0-SNAPSHOT

previousVersion = 0.15.0.1
previousVersion = 0.15.1.1
homepage = https://dev.leakyabstractions.com/result/
githubId = leakyabstractions/result
repository = https://github.com/leakyabstractions/result
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
assertj = "3.26.0"
google-java-format = "1.19.2"
jacoco = "0.8.10"
japicmp = "0.4.2"
japicmp = "0.4.3"
junit = "5.10.2"
nexus-publish = "2.0.0"
result-api = "0.1.0.4"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down

0 comments on commit 8c560cc

Please sign in to comment.