Skip to content

Commit

Permalink
update dependencies and tested versions
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielittner committed Sep 2, 2024
1 parent da59946 commit ed67e74
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 26 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
- name: Accept Android SDK license
run: yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses

- uses: gradle/actions/setup-gradle@v3
with:
validate-wrappers: true
- uses: gradle/actions/setup-gradle@v4

- name: Build with Gradle
run: ./gradlew build --stacktrace -DtestConfigMethod=${{ matrix.test_config_method }}
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: |
echo "ORG_GRADLE_PROJECT_VERSION_NAME=${{ github.ref_name }}" >> $GITHUB_ENV
- uses: gradle/gradle-build-action@v3
- uses: gradle/gradle-build-action@v4

- name: Publish
run: ./gradlew publishAndReleaseToMavenCentral
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: |
echo "ORG_GRADLE_PROJECT_VERSION_NAME=$(git describe --tags --abbrev=0 | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.)-SNAPSHOT" >> $GITHUB_ENV
- uses: gradle/gradle-build-action@v3
- uses: gradle/gradle-build-action@v4

- name: Publish
run: ./gradlew publishToMavenCentral
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
kotlin = "2.0.0"
kotlin = "2.0.20"
moshi = "1.15.1"
retrofit = "2.11.0"
junit = "5.10.2"
truth = "1.4.2"
maven-publish = "0.29.0-rc1"
junit = "5.11.0"
truth = "1.4.4"
maven-publish = "0.29.0"
ktlint = "12.1.1"

[libraries]
okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20"
android-plugin = "com.android.tools.build:gradle:8.5.0"
android-plugin = "com.android.tools.build:gradle:8.6.0"
ktlint-plugin = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint" }
maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "maven-publish" }

Expand All @@ -31,10 +31,10 @@ testParameterInjector = "com.google.testparameterinjector:test-parameter-injecto
truth = { module = "com.google.truth:truth", version.ref = "truth" }
truth-java8 = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truth" }
truth-testKit = "com.autonomousapps:testkit-truth:1.1"
maven-model = "org.apache.maven:maven-model:3.9.8"
maven-model = "org.apache.maven:maven-model:3.9.9"

[plugins]
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.3.5" }
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.4.0" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ enum class AgpVersion(
),

// stable
AGP_8_5(
value = "8.5.0",
AGP_8_6(
value = "8.6.0",
minGradleVersion = GradleVersion.GRADLE_8_6,
),

// canary channel
AGP_8_6(
value = "8.6.0-alpha06",
AGP_8_7(
value = "8.7.0-alpha08",
minGradleVersion = GradleVersion.GRADLE_8_6,
),
}
Expand All @@ -55,10 +55,7 @@ enum class KotlinVersion(
KT_1_9_23("1.9.24"),

// stable
KT_2_0_0("2.0.0"),

// beta
KT_2_0_20("2.0.20-Beta1"),
KT_2_0_20("2.0.20"),
}

enum class GradleVersion(
Expand All @@ -72,14 +69,14 @@ enum class GradleVersion(
),

// stable
GRADLE_8_7(
value = "8.8",
GRADLE_8_10(
value = "8.10",
),
;

companion object {
// aliases for the skipped version to be able to reference the correct one in AgpVersion
val GRADLE_8_6 = GRADLE_8_7
val GRADLE_8_6 = GRADLE_8_10
}
}

Expand All @@ -88,7 +85,7 @@ enum class GradlePluginPublish(val version: String) {
GRADLE_PLUGIN_PUBLISH_1_0("1.0.0"),

// stable
GRADLE_PLUGIN_PUBLISH_1_2("1.2.1"),
GRADLE_PLUGIN_PUBLISH_1_2("1.2.2"),
}

fun GradleVersion.assumeSupportedJdkVersion() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import java.io.Serializable
*
* https://central.sonatype.org/articles/2021/Feb/23/new-users-on-s01osssonatypeorg/
*/
@ConsistentCopyVisibility
data class SonatypeHost internal constructor(
internal val rootUrl: String,
internal val isCentralPortal: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pluginManagement {
}

plugins {
id("com.gradle.develocity") version "3.17.5"
id("com.gradle.develocity") version "3.18"
}

develocity {
Expand Down

0 comments on commit ed67e74

Please sign in to comment.