From 636dd5640d2e3234ef529d77c38c4d666819b771 Mon Sep 17 00:00:00 2001 From: Henry Addo Date: Sat, 21 Dec 2024 09:23:26 -0800 Subject: [PATCH 1/4] Use JDK 22 on github actions as AGP requires java 17 and above --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d73ce7a..c8d3b3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,11 +20,11 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/actions/wrapper-validation@v4 - - name: Install JDK 11 + - name: Install JDK 22 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 11 + java-version: '22' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -45,11 +45,11 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/actions/wrapper-validation@v4 - - name: Install JDK 11 + - name: Install JDK 22 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 11 + java-version: '22' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From 74138c933632460170b18422934daabe371c9965 Mon Sep 17 00:00:00 2001 From: Henry Addo Date: Sat, 21 Dec 2024 09:37:51 -0800 Subject: [PATCH 2/4] Add stacktrace option to gradle build command --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8d3b3f..21e2d66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build --stacktrace publish: if: github.repository == 'sproctor/compose-data-table' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' From de92cdd1777a6a5a2a6fcf6c0e66c084851d0139 Mon Sep 17 00:00:00 2001 From: Henry Addo Date: Sat, 21 Dec 2024 10:00:49 -0800 Subject: [PATCH 3/4] Add scrollbar actual implementation for js target --- .../com/seanproctor/datatable/demo/Scrollbar.ios.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.ios.kt diff --git a/demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.ios.kt b/demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.ios.kt new file mode 100644 index 0000000..38f9249 --- /dev/null +++ b/demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.ios.kt @@ -0,0 +1,11 @@ +package com.seanproctor.datatable.demo + +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.seanproctor.datatable.DataTableScrollState + +@Composable +actual fun VerticalScrollbar(scrollState: DataTableScrollState, modifier: Modifier) {} + +@Composable +actual fun HorizontalScrollbar(scrollState: DataTableScrollState, modifier: Modifier) {} \ No newline at end of file From 09aa439ddb4f208cd0f917fa232c89197f1451b2 Mon Sep 17 00:00:00 2001 From: Henry Addo Date: Sun, 22 Dec 2024 06:44:22 -0800 Subject: [PATCH 4/4] Rename file to match its target name --- .../datatable/demo/{Scrollbar.ios.kt => Scrollbar.js.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/{Scrollbar.ios.kt => Scrollbar.js.kt} (100%) diff --git a/demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.ios.kt b/demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.js.kt similarity index 100% rename from demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.ios.kt rename to demo-common/src/jsMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.js.kt