From 6f38609ef0aae3d875def2931eecb945404204b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BAben=20Sousa?= Date: Tue, 23 Jul 2024 23:33:41 +0100 Subject: [PATCH 1/3] Bump to 1.3.0-rc03 --- docs/changelog.md | 9 +++++++++ gradle.properties | 2 +- mkdocs.yml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 91a089b3..fa657c50 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,15 @@ ## Version 1.3.0 +### 1.3.0-rc03 + +2024-07-23 + +#### Bug fixes + +- Fixed layout inconsistency after some predictive animations ([#240](https://github.com/rubensousa/DpadRecyclerView/pull/240)) +- Fixed rare crash when removing an item due to adapter changes while a scroll action is pending ([#240](https://github.com/rubensousa/DpadRecyclerView/pull/240)) + ### 1.3.0-rc02 2024-07-11 diff --git a/gradle.properties b/gradle.properties index 572ccdca..734975c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,4 +22,4 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true android.enableR8.fullMode=true -LIBRARY_VERSION=1.3.0-rc02 \ No newline at end of file +LIBRARY_VERSION=1.3.0-rc03 \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 151915cd..e0547e64 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -24,7 +24,7 @@ theme: extra: dpadrecyclerview: - version: '1.3.0-rc02' + version: '1.3.0-rc03' social: - icon: 'fontawesome/brands/github' link: 'https://github.com/rubensousa/DpadRecyclerView' From b706e54301b143a0ecf8cf22425b4cd753ba38c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BAben=20Sousa?= Date: Tue, 23 Jul 2024 23:34:03 +0100 Subject: [PATCH 2/3] Update configuration for publishing releases --- build.gradle | 37 +++++++++++++++++++++++++++++++++++++ gradle/publish.gradle | 27 --------------------------- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 58f37266..3b81c755 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ plugins { alias libs.plugins.kotlin.android apply false alias libs.plugins.kotlin.kover apply false alias libs.plugins.androidx.navigation.safeargs apply false + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' id 'org.jetbrains.dokka' version '1.9.20' id 'org.jetbrains.kotlinx.binary-compatibility-validator' version "0.14.0" } @@ -21,3 +22,39 @@ apiValidation { ignoredProjects += ["sample", "dpadrecyclerview-test-fixtures"] ignoredClasses += "com.rubensousa.dpadrecyclerview.BuildConfig" } + +nexusPublishing { + repositories { + sonatype { + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + stagingProfileId = getSonatypeStagingId() + username = getSonatypeUsername() + password = getSonatypePassword() + } + } +} + +String getSonatypeStagingId() { + if (hasProperty("ossrhStagingProfileId")) { + return ossrhStagingProfileId + } else { + return "" + } +} + +String getSonatypeUsername() { + if (hasProperty("ossrhUsername")) { + return ossrhUsername + } else { + return "" + } +} + +String getSonatypePassword() { + if (hasProperty("ossrhPassword")) { + return ossrhPassword + } else { + return "" + } +} \ No newline at end of file diff --git a/gradle/publish.gradle b/gradle/publish.gradle index ffa54d32..65151767 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -92,22 +92,6 @@ String getSecretKeyRingFilePath() { } } -String getSonatypeUsername() { - if (hasProperty("ossrhUsername")) { - return ossrhUsername - } else { - return "" - } -} - -String getSonatypePassword() { - if (hasProperty("ossrhPassword")) { - return ossrhPassword - } else { - return "" - } -} - afterEvaluate { project -> publishing { publications { @@ -119,17 +103,6 @@ afterEvaluate { project -> configurePom(pom) } } - repositories { - maven { - name = "sonatype" - url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" - - credentials { - username getSonatypeUsername() - password getSonatypePassword() - } - } - } } } From 80d42ede7fb120572f66061a12082a7a8801671b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BAben=20Sousa?= Date: Tue, 23 Jul 2024 23:38:18 +0100 Subject: [PATCH 3/3] Add other api levels to skip job --- .github/workflows/pr_skipped.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_skipped.yml b/.github/workflows/pr_skipped.yml index 4e1a98de..dc66d289 100644 --- a/.github/workflows/pr_skipped.yml +++ b/.github/workflows/pr_skipped.yml @@ -27,7 +27,7 @@ jobs: matrix: arch: [ x86 ] target: [ android-tv ] - api-level: [ 27 ] + api-level: [27, 28, 29, 30, 31] profile: [ tv_1080p ] steps: - run: 'echo "No build required"' \ No newline at end of file