Merge branch 'main' into openssl-3.3.1

bloomberg · Aug 17, 2024 · db8a32d · db8a32d
2 parents ab0abc0 + e28ba7f
commit db8a32d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
@@ -43,8 +43,8 @@ jobs:
         ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }}
         ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY_ID }}
         ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_KEY_PASSPHRASE }}
-        ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
-        ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
+        ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_USER_TOKEN_PASSWORD }}
+        ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USER_TOKEN_USERNAME }}
       run: |
         ./gradlew \
           publishMainPublicationToSonatypeRepository \
@@ -55,8 +55,8 @@ jobs:
         ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }}
         ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY_ID }}
         ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_KEY_PASSPHRASE }}
-        ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
-        ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
+        ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_USER_TOKEN_PASSWORD }}
+        ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USER_TOKEN_USERNAME }}
       run: |
         ./gradlew \
           -Prelease \

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,25 +3,25 @@
 [versions]
 benchmark = "1.2.4"
 jmh = "1.37"
-lint = "31.5.0"
+lint = "31.5.2"
 room = "2.6.1"
 
 [libraries]
-android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.0" }
+android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.2" }
 android-tools-lint = { group = "com.android.tools.lint", name = "lint", version.ref = "lint" }
 android-tools-lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
 androidx-benchmark-junit4 = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmark" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.13.1" }
-androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.8.3" }
-androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "3.3.0" }
+androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.8.4" }
+androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "3.3.2" }
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
 androidx-test-ext = { group = "androidx.test.ext", name = "junit", version = "1.2.1" }
 androidx-test-rules = { group = "androidx.test", name = "rules", version = "1.6.1" }
-androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.1" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.2" }
 findbugs-jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" }
 jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
@@ -43,7 +43,7 @@ robolectric-android-all = { group = "org.robolectric", name = "android-all", ver
 androidx-benchmark = { id = "androidx.benchmark", version.ref = "benchmark" }
 cash-licensee = { id = "app.cash.licensee", version = "1.6.0" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" }
-dokka = { id = "org.jetbrains.dokka", version = "1.9.10" }
+dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }
 kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.5.0" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionSha256Sum=682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
 networkTimeout=120000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists