Skip to content

Commit

Permalink
[1.64.*] Pre-release merge (#465)
Browse files Browse the repository at this point in the history
  • Loading branch information
tramline-github[bot] authored Feb 28, 2024
2 parents 663cfc5 + 1e29a86 commit fa7fe41
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fetch-depth: 0

- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
distribution: temurin
java-version: 18
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
distribution: temurin
java-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code_quality_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
distribution: temurin
java-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fetch-depth: 0

- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
distribution: temurin
java-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tramline-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
distribution: temurin
java-version: 18
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
aboutLibraries = "11.1.0-b03"
aboutLibraries = "11.1.0"
agp = "8.3.0-rc02"
benchmark = "1.3.0-alpha01"
coil = "2.6.0"
# @keep used for kotlinCompilerExtensionVersion
composeCompiler = "1.5.10"
coroutines = "1.8.0"
dagger = "2.50"
dagger = "2.51"
glance = "1.0.0"
junit = "5.10.2"
konvert = "3.0.1"
Expand All @@ -18,7 +18,7 @@ richtext = "0.20.0"
sentry-sdk = "7.4.0"
serialization = "1.6.3"
sqldelight = "2.0.1"
whetstone = "0.8.0"
whetstone = "0.9.0-SNAPSHOT"
workmanager = "2.10.0-alpha01"

[libraries]
Expand Down Expand Up @@ -109,7 +109,7 @@ unfurl = "me.saket.unfurl:unfurl:1.7.0"
[plugins]
aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibraries" }
android-test = { id = "com.android.test", version.ref = "agp" }
anvil = "com.squareup.anvil:2.4.9"
anvil = "com.squareup.anvil:2.5.0-beta03"
baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ksp = "com.google.devtools.ksp:1.9.22-1.0.17"
Expand Down
5 changes: 1 addition & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,7 @@ dependencyResolutionManagement {
}
maven("https://oss.sonatype.org/content/repositories/snapshots/") {
name = "Sonatype Snapshots"
content {
includeGroup("dev.msfjarvis.whetstone")
includeGroup("me.saket.swipe")
}
content { includeGroup("dev.msfjarvis.whetstone") }
mavenContent { snapshotsOnly() }
}
mavenCentral { mavenContent { releasesOnly() } }
Expand Down

0 comments on commit fa7fe41

Please sign in to comment.