Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: "zulu"
java-version: 21
java-version: 25
- name: Set executable flag on gradlew
run: chmod +x gradlew
- name: Execute tests
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: "zulu"
java-version: 21
java-version: 25
- name: Set executable flag on gradlew
run: chmod +x gradlew
- name: Build artifact
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 21 ]
java: [ 25 ]
steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -47,11 +47,11 @@ jobs:
files: |
/github/workspace/**/build/test-results/**/*.xml
- name: Generate coverage
if: ${{ matrix.java == 21 }}
if: ${{ matrix.java == 25 }}
run: ./gradlew koverXmlReportJvm
- name: Upload coverage
uses: codecov/[email protected]
if: ${{ matrix.java == 21 }}
if: ${{ matrix.java == 25 }}
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: manami-app/build/reports/kover/reportJvm.xml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Tests](https://github.com/manami-project/manami/actions/workflows/tests.yml/badge.svg)](https://github.com/manami-project/manami/actions/workflows/tests.yml) [![codecov](https://codecov.io/gh/manami-project/manami/graph/badge.svg?token=DkoslLUvTn)](https://codecov.io/gh/manami-project/manami) ![jdk21](https://img.shields.io/badge/jdk-21-informational)
[![Tests](https://github.com/manami-project/manami/actions/workflows/tests.yml/badge.svg)](https://github.com/manami-project/manami/actions/workflows/tests.yml) [![codecov](https://codecov.io/gh/manami-project/manami/graph/badge.svg?token=DkoslLUvTn)](https://codecov.io/gh/manami-project/manami) ![jdk25](https://img.shields.io/badge/jdk-25-informational)
# Manami

## What does it do?
Expand Down
6 changes: 3 additions & 3 deletions manami-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

val githubUsername = "manami-project"
val kotlinVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2 // most recent stable kotlin version for language and std lib
val kotlinVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3 // most recent stable kotlin version for language and std lib

repositories {
mavenCentral()
Expand All @@ -31,13 +31,13 @@ dependencies {
}

kotlin {
jvmToolchain(JavaVersion.VERSION_21.toString().toInt())
jvmToolchain(JavaVersion.VERSION_25.toString().toInt())
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
dependsOn("generateBuildConfig")
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget.set(JvmTarget.JVM_25)
apiVersion.set(kotlinVersion)
languageVersion.set(kotlinVersion)
}
Expand Down
6 changes: 3 additions & 3 deletions manami-compose-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

val githubUsername = "manami-project"
val kotlinVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2 // most recent stable kotlin version for language and std lib
val kotlinVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3 // most recent stable kotlin version for language and std lib

repositories {
google()
Expand All @@ -34,12 +34,12 @@ dependencies {
}

kotlin {
jvmToolchain(JavaVersion.VERSION_21.toString().toInt())
jvmToolchain(JavaVersion.VERSION_25.toString().toInt())
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget.set(JvmTarget.JVM_25)
apiVersion.set(kotlinVersion)
languageVersion.set(kotlinVersion)
}
Expand Down
Loading