Skip to content

Commit

Permalink
Merge pull request #29 from MohamedRejeb/0.2.x
Browse files Browse the repository at this point in the history
Update ci
  • Loading branch information
MohamedRejeb authored Oct 10, 2024
2 parents d04c7b5 + 73192ff commit 0e92c44
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:

jobs:
build:
runs-on: macos-14
runs-on: macos-latest

steps:
- uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
distribution: 'zulu'

- name: Setup gradle
uses: gradle/actions/setup-gradle@v3
Expand All @@ -44,14 +44,14 @@ jobs:
deploy:
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
needs: build
runs-on: macos-14
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
distribution: 'zulu'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ plugins {
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.kotlinAndroid) apply false
// alias(libs.plugins.spotless) apply false
alias(libs.plugins.spotless) apply false
}
2 changes: 1 addition & 1 deletion compose-dnd/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

/*
* Copyright 2023, Mohamed Ben Rejeb and the Compose Dnd project contributors
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ dependencyResolutionManagement {
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}

include(
":compose-dnd",

Expand Down

0 comments on commit 0e92c44

Please sign in to comment.