diff --git a/.github/workflows/open-api-ci-cd.yml b/.github/workflows/open-api-ci-cd.yml index 62b3b7f4..0fae5f5f 100644 --- a/.github/workflows/open-api-ci-cd.yml +++ b/.github/workflows/open-api-ci-cd.yml @@ -51,10 +51,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Prepare Java SDK 11 + - name: Prepare Java SDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Cache Gradle packages uses: actions/cache@v2 @@ -109,10 +109,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Prepare Java SDK 11 + - name: Prepare Java SDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Build project run: ./gradlew assemble diff --git a/build.gradle b/build.gradle index d486a0a0..5ddf5fa0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ plugins { id 'jacoco' id 'idea' - id 'org.jetbrains.kotlin.jvm' version '1.3.72' - id 'org.jetbrains.kotlin.kapt' version '1.3.72' - id 'org.jetbrains.kotlin.plugin.spring' version '1.3.72' - id 'org.jetbrains.kotlin.plugin.jpa' version '1.3.72' - id 'org.springframework.boot' version '2.0.4.RELEASE' + id 'org.jetbrains.kotlin.jvm' version '1.8.22' + id 'org.jetbrains.kotlin.kapt' version '1.8.22' + id 'org.jetbrains.kotlin.plugin.spring' version '1.8.22' + id 'org.jetbrains.kotlin.plugin.jpa' version '1.8.22' + id 'org.springframework.boot' version '2.7.18' id 'com.palantir.git-version' version '0.12.0-rc2' id 'io.zensoft.versioning' version '1.1.0' } @@ -13,14 +13,15 @@ plugins { apply plugin: 'io.spring.dependency-management' group = 'io.openfuture.api' -sourceCompatibility = 11 +sourceCompatibility = 17 +targetCompatibility = 17 repositories { mavenCentral() } ext { - s3Version = "1.11.333" + s3Version = "1.12.261" } dependencies { @@ -30,6 +31,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-freemarker") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-validation") // OAuth implementation("org.springframework.security:spring-security-oauth2-client") @@ -41,8 +43,14 @@ dependencies { // Ethereum implementation("org.web3j:web3j-spring-boot-starter:1.6.0") - implementation('org.web3j:core:4.5.0') - compile group: 'org.web3j', name: 'web3j-sokt', version: '0.2.1' + implementation('org.web3j:core:4.12.0'){ + exclude group : 'org.bouncycastle', module : 'bcprov-jdk18on' + exclude group : 'com.squareup.okhttp3', module : 'okhttp' + } + implementation('org.bouncycastle:bcprov-jdk18on:1.78.1') + implementation('com.squareup.okhttp3:okhttp:4.12.0') + + implementation('org.web3j:web3j-sokt:0.4.0') // AWS implementation("com.amazonaws:aws-java-sdk-s3:${s3Version}") @@ -60,11 +68,20 @@ dependencies { implementation('commons-io:commons-io:2.8.0') implementation 'org.apache.commons:commons-lang3:3.6' - implementation('org.apache.httpcomponents:httpclient:4.5.12') + implementation('org.apache.httpcomponents:httpclient:4.5.13') // Test testImplementation('org.springframework.boot:spring-boot-starter-test') testImplementation("org.mockito:mockito-core:2.22.0") + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3' + testImplementation("junit:junit:4.13.1") + +} + +test { + useJUnitPlatform() } sourceSets { @@ -79,13 +96,13 @@ sourceSets { compileKotlin { kotlinOptions { freeCompilerArgs = ["-Xjsr305=strict"] - jvmTarget = "11" + jvmTarget = "17" } } compileTestKotlin { kotlinOptions { freeCompilerArgs = ["-Xjsr305=strict"] - jvmTarget = "11" + jvmTarget = "17" } } @@ -111,7 +128,7 @@ jacocoTestReport { check.dependsOn jacocoTestReport // Front -processResources.dependsOn(':frontend:assemble') -processResources.dependsOn(':widget:assemble') -processResources.dependsOn(':tracker:assemble') -processResources.dependsOn(':payment-chooser:assemble') \ No newline at end of file +//processResources.dependsOn(':frontend:assemble') +//processResources.dependsOn(':widget:assemble') +//processResources.dependsOn(':tracker:assemble') +//processResources.dependsOn(':payment-chooser:assemble') \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 21e622da..ffed3a25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/io/openfuture/api/component/web3/event/PaymentCompletedDecoder.kt b/src/main/kotlin/io/openfuture/api/component/web3/event/PaymentCompletedDecoder.kt index 5f570ce6..648fe3c5 100644 --- a/src/main/kotlin/io/openfuture/api/component/web3/event/PaymentCompletedDecoder.kt +++ b/src/main/kotlin/io/openfuture/api/component/web3/event/PaymentCompletedDecoder.kt @@ -41,7 +41,7 @@ class PaymentCompletedDecoder(private val ethereumScaffoldPropertyRepository: Et val signature = mutableListOf( object : TypeReference() {}, object : TypeReference
() {}, - object : TypeReference() {}, + object : TypeReference() {}, object : TypeReference() {} ) diff --git a/src/main/kotlin/io/openfuture/api/domain/PageRequest.kt b/src/main/kotlin/io/openfuture/api/domain/PageRequest.kt index d8d9585a..4bbf1f36 100644 --- a/src/main/kotlin/io/openfuture/api/domain/PageRequest.kt +++ b/src/main/kotlin/io/openfuture/api/domain/PageRequest.kt @@ -16,9 +16,10 @@ open class PageRequest( override fun getOffset(): Long = offset - override fun getSort(): Sort = Sort(ASC, "id") + override fun getSort(): Sort = Sort.by(ASC, "id") override fun first(): Pageable = PageRequest(0, limit) + override fun withPage(pageNumber: Int): Pageable = PageRequest(pageNumber.toLong(), limit) override fun previous(): PageRequest { return if (offset == 0L) this else { diff --git a/src/test/kotlin/io/openfuture/api/component/scaffold/V1ScaffoldCompilerTests.kt b/src/test/kotlin/io/openfuture/api/component/scaffold/V1ScaffoldCompilerTests.kt index d5a857be..74dadf27 100644 --- a/src/test/kotlin/io/openfuture/api/component/scaffold/V1ScaffoldCompilerTests.kt +++ b/src/test/kotlin/io/openfuture/api/component/scaffold/V1ScaffoldCompilerTests.kt @@ -15,6 +15,8 @@ import org.junit.Test import org.mockito.BDDMockito.given import org.mockito.Mock import java.nio.charset.Charset +import java.util.* +import kotlin.collections.HashMap internal class V1ScaffoldCompilerTests : UnitTest() { @@ -225,7 +227,7 @@ internal class V1ScaffoldCompilerTests : UnitTest() { private fun createScaffoldContent(): String { val resource = javaClass.classLoader - .getResource("templates/ethereum/scaffold_${ethereumScaffoldCompiler.getVersion().name.toLowerCase()}.ftl") + .getResource("templates/ethereum/scaffold_${ethereumScaffoldCompiler.getVersion().name.lowercase()}.ftl") return IOUtils.toString(resource, Charset.defaultCharset()) }