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

chore: #37 Java 21 support and bump yaci store version to fix decimal… #38

Merged
merged 2 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
uses: actions/checkout@v2
with:
submodules: 'true'
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'temurin'
java-version: '21'
distribution: 'liberica'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 0 additions & 2 deletions application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ dependencies {
implementation project(':components:scheduler')

implementation(libs.yaci.store.starter)
implementation(libs.yaci.store.utxo.starter)
implementation(libs.yaci.store.account.starter)

implementation(libs.cardano.client.lib)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package org.cardanofoundation.ledgersync.explorerconsumer.service.impl;
;

import com.bloxbean.cardano.client.plutus.spec.RedeemerTag;
import org.cardanofoundation.explorer.consumercommon.entity.*;
import org.cardanofoundation.explorer.consumercommon.entity.Tx.TxBuilder;
Expand Down Expand Up @@ -721,4 +721,4 @@ private static MaTxOut givenMaTxOut(long txOutId, String fingerprint, BigInteger
.quantity(quantity)
.build();
}
}
}
31 changes: 18 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
id 'nu.studer.jooq' version '8.2'

id 'io.spring.dependency-management' version '1.1.3'
id 'org.ajoberstar.grgit' version '5.2.0'
}


Expand All @@ -22,6 +23,12 @@ subprojects {
}

archivesBaseName = 'ledger-sync-' + project.name

def commit_id=getCheckedOutGitCommitHash()
if (project.version.endsWith("-SNAPSHOT")) {
version = "${project.version}".replace("-SNAPSHOT", "-${commit_id}-SNAPSHOT")
}

dependencyManagement {
imports {
mavenBom("org.springframework.boot:spring-boot-dependencies:3.1.4")
Expand All @@ -34,8 +41,8 @@ subprojects {
}

compileJava {
sourceCompatibility = '17'
targetCompatibility = '17'
sourceCompatibility = '21'
targetCompatibility = '21'

options.compilerArgs += ["-Aproject=${project.group}/${project.name}", "-parameters"]
options.compilerArgs += ['-Amapstruct.defaultComponentModel=spring']
Expand All @@ -46,22 +53,20 @@ subprojects {
}

task sourceJar(type: Jar) {
classifier "sources"
from sourceSets.main.allJava
from sourceSets.main.allSource
archiveClassifier.set('sources')
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier "javadoc"
from javadoc.destinationDir
}

artifacts {
archives jar
archives sourceJar
archives javadocJar
task javadocJar(type: Jar) {
from javadoc
archiveClassifier.set('javadoc')
}

test {
useJUnitPlatform()
}
}

def getCheckedOutGitCommitHash() {
grgit.head().abbreviatedId
}
8 changes: 3 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[libraries]
yaci-store-starter="com.bloxbean.cardano:yaci-store-spring-boot-starter:0.0.13-0bfab9f-SNAPSHOT"
yaci-store-utxo-starter="com.bloxbean.cardano:yaci-store-utxo-spring-boot-starter:0.0.13-0bfab9f-SNAPSHOT"
yaci-store-account-starter="com.bloxbean.cardano:yaci-store-account-spring-boot-starter:0.0.13-0bfab9f-SNAPSHOT"
yaci-store-starter="com.bloxbean.cardano:yaci-store-spring-boot-starter:0.0.13-b1e2780-SNAPSHOT"

cardano-client-lib="com.bloxbean.cardano:cardano-client-lib:0.5.0"
snakeyaml="org.yaml:snakeyaml:2.0"
Expand All @@ -10,7 +8,7 @@ log4j-api="org.apache.logging.log4j:log4j-api:2.20.0"
log4j-core="org.apache.logging.log4j:log4j-core:2.20.0"
jakarta-validation-api="jakarta.validation:jakarta.validation-api:3.0.2"

lombok="org.projectlombok:lombok:1.18.26"
lombok="org.projectlombok:lombok:1.18.30"
lombok-mapstruct-binding="org.projectlombok:lombok-mapstruct-binding:0.2.0"
map-struct="org.mapstruct:mapstruct:1.5.3.Final"
mapstruct-processor="org.mapstruct:mapstruct-processor:1.5.3.Final"
Expand All @@ -33,4 +31,4 @@ jackson-core="com.fasterxml.jackson.core:jackson-core:2.15.2"
jackson-annotation="com.fasterxml.jackson.core:jackson-annotations:2.15.2"

jgit="org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r"
javax-api="javax.xml.bind:jaxb-api:2.2.3"
javax-api="javax.xml.bind:jaxb-api:2.2.3"
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-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists