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

Fix failing CI tests #641

Merged
merged 6 commits into from
Jun 29, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/.ci_test_and_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Set up our JDK environment
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 11
distribution: 'temurin'
java-version: 17

- name: Upload Artifacts
run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 11
java-version: 17
- name: Run tests
run: ./gradlew check --rerun-tasks --stacktrace
- name: Upload code coverage
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
- name: Run check with Gradle Wrapper
run: ./gradlew check

Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ captures/
# Keystore files
*.jks

store/kover
**/kover/html/
*.podspec
.kotlin/
yarn.lock
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
alias(libs.plugins.ktlint)
id("com.diffplug.spotless") version "6.4.1"
}

Expand Down Expand Up @@ -49,13 +49,13 @@ subprojects {
tasks {
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
}

withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.name
targetCompatibility = JavaVersion.VERSION_11.name
sourceCompatibility = JavaVersion.VERSION_17.name
targetCompatibility = JavaVersion.VERSION_17.name
}
}

Expand Down
19 changes: 4 additions & 15 deletions cache/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import com.vanniktech.maven.publish.SonatypeHost.S01
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask

plugins {
kotlin("multiplatform")
Expand Down Expand Up @@ -70,7 +68,7 @@ kotlin {
}
}

jvmToolchain(11)
jvmToolchain(17)
}

android {
Expand All @@ -92,16 +90,16 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}

tasks.withType<DokkaTask>().configureEach {
dokkaSourceSets.configureEach {
reportUndocumented.set(false)
skipDeprecated.set(true)
jdkVersion.set(8)
jdkVersion.set(17)
}
}

Expand All @@ -127,12 +125,3 @@ koverMerged {
onCheck.set(true)
}
}

// See https://youtrack.jetbrains.com/issue/KT-63014
rootProject.the<NodeJsRootExtension>().apply {
nodeVersion = "21.0.0-v8-canary20231024d0ddc81258"
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
}
tasks.withType<KotlinNpmInstallTask>().configureEach {
args.add("--ignore-engines")
}
24 changes: 24 additions & 0 deletions cache/config/ktlint/baseline.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="src/commonMain/kotlin/org/mobilenativefoundation/store/cache5/LocalCache.kt">
<error line="240" column="9" source="standard:no-consecutive-comments" />
<error line="367" column="9" source="standard:no-consecutive-comments" />
<error line="396" column="9" source="standard:no-consecutive-comments" />
<error line="399" column="9" source="standard:no-consecutive-comments" />
<error line="408" column="9" source="standard:no-consecutive-comments" />
<error line="417" column="9" source="standard:no-consecutive-comments" />
<error line="428" column="9" source="standard:no-consecutive-comments" />
<error line="431" column="9" source="standard:no-consecutive-comments" />
<error line="440" column="9" source="standard:no-consecutive-comments" />
<error line="449" column="9" source="standard:no-consecutive-comments" />
<error line="508" column="30" source="standard:discouraged-comment-location" />
<error line="628" column="5" source="standard:no-consecutive-comments" />
<error line="640" column="5" source="standard:no-consecutive-comments" />
<error line="708" column="9" source="standard:no-consecutive-comments" />
<error line="1466" column="13" source="standard:no-consecutive-comments" />
<error line="1873" column="9" source="standard:no-consecutive-comments" />
</file>
<file name="src/commonMain/kotlin/org/mobilenativefoundation/store/cache5/StoreMultiCache.kt">
<error line="15" column="1" source="standard:max-line-length" />
</file>
</baseline>
Loading
Loading