Skip to content

Commit

Permalink
Merge pull request #41 from InkApplications/gradle-updates
Browse files Browse the repository at this point in the history
Project Gradle and library updates
  • Loading branch information
ReneeVandervelde authored Dec 14, 2024
2 parents 3e4bd52 + 991059c commit be0bfbe
Show file tree
Hide file tree
Showing 10 changed files with 140 additions and 243 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: [pull_request]
jobs:
tests:
uses: inkapplications/.github/.github/workflows/kmp-checks.yml@1.1.2
uses: inkapplications/.github/.github/workflows/kmp-checks.yml@1.2.0
2 changes: 1 addition & 1 deletion .github/workflows/pushes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on:
branches: [master]
jobs:
tests:
uses: inkapplications/.github/.github/workflows/kmp-checks.yml@1.1.2
uses: inkapplications/.github/.github/workflows/kmp-checks.yml@1.2.0
4 changes: 2 additions & 2 deletions .github/workflows/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ env:
jobs:
tests:
name: Test
uses: inkapplications/.github/.github/workflows/kmp-checks.yml@1.1.2
uses: inkapplications/.github/.github/workflows/kmp-checks.yml@1.2.0
publish:
name: Publish to Maven Central
needs: tests
secrets: inherit
uses: inkapplications/.github/.github/workflows/kmp-maven-publish.yml@1.1.2
uses: inkapplications/.github/.github/workflows/kmp-maven-publish.yml@1.2.0
with:
version: ${{ github.ref_name }}
publish-android: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
**/build/
!src/**/build/
local.properties
.kotlin
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2023 Ink Applications
Copyright 2023-2024 Ink Applications

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion gradlew → bin/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH=$APP_HOME/../gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
kotlin = "2.0.10"
kotlin = "2.1.0"
coroutines = "1.9.0"
sqldelight = "2.0.1"
sqldelight = "2.0.2"
watermelon = "1.7.0"

[libraries.kotlin-gradle]
Expand Down Expand Up @@ -41,7 +41,7 @@ version = "1.6.1"
module = "androidx.appcompat:appcompat"

[libraries.kotlinx-binary-compatibility]
version = "0.13.2"
version = "0.16.3"
module = "org.jetbrains.kotlinx:binary-compatibility-validator"

[libraries.watermelon-data]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
92 changes: 0 additions & 92 deletions gradlew.bat

This file was deleted.

Loading

0 comments on commit be0bfbe

Please sign in to comment.