diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 22be075..92a67bf 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,9 +16,9 @@ jobs: environment: build steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'zulu' @@ -33,7 +33,7 @@ jobs: REMOTE_CACHE_USER: ${{ secrets.REMOTE_CACHE_USER }} REMOTE_CACHE_PASS: ${{ secrets.REMOTE_CACHE_PASS }} run: ./gradlew clean build - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Package path: build/libs diff --git a/.github/workflows/mavenCentral.yml b/.github/workflows/mavenCentral.yml index d7b3e88..53b8989 100644 --- a/.github/workflows/mavenCentral.yml +++ b/.github/workflows/mavenCentral.yml @@ -12,9 +12,9 @@ jobs: environment: build steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.java }} diff --git a/build.gradle.kts b/build.gradle.kts index 90009b8..9866bd4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ plugins { tasks { wrapper { - gradleVersion = "8.5" + gradleVersion = "8.6" distributionType = Wrapper.DistributionType.BIN } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a93ee7..1063464 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,7 @@ [versions] #libs -kotlinx-serialization = "1.5.1" -vanniktech-maven-publish = "0.25.3" -evalex = "3.1.0" +kotlinx-serialization = "1.6.2" +vanniktech-maven-publish = "0.27.0" androidx-startup = "1.1.1" androidx-appcompat = "1.6.1" androidx-fragment-ktx = "1.6.2" @@ -10,8 +9,8 @@ android-material = "1.11.0" junit = "4.13.2" #plugins -kotlin= "1.9.21" -gradlePlugins-agp = "8.2.1" +kotlin= "1.9.22" +gradlePlugins-agp = "8.2.2" tomlChecker = "0.47.0" gradleCacheFix = "3.0" dokka = "1.9.10" @@ -20,7 +19,6 @@ dokka = "1.9.10" dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } -evalex = { module = "com.ezylang:EvalEx", version.ref = "evalex"} androidx-startup = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment-ktx" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/savestateobserver/build.gradle.kts b/savestateobserver/build.gradle.kts index b61c818..bb42093 100644 --- a/savestateobserver/build.gradle.kts +++ b/savestateobserver/build.gradle.kts @@ -9,7 +9,7 @@ plugins { alias(libs.plugins.toml.version.checker) } -version = "2.12.0" +version = "2.12.1" group = "com.pnuema.android" android {