From 8fb0f23cb1543968a59b097905a7332c53899604 Mon Sep 17 00:00:00 2001 From: 2BAB Date: Sat, 19 Mar 2022 21:33:02 +0800 Subject: [PATCH] release: update version and ci commands To avoid extra publications getting released to maven central --- .github/workflows/ci.yml | 2 +- README.md | 7 ++++--- README_zh.md | 8 ++++---- publish_to_local.sh | 2 +- scratch-paper/buildSrc/src/main/kotlin/BuildConfig.kt | 2 +- test-app/build.gradle.kts | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 415f077..9eb36e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: AGP_VERSION: ${{ matrix.agp-version }} strategy: matrix: - agp-version: [ 7.0.3, 7.1.0-beta04 ] + agp-version: [ 7.1.2, 7.2.0-beta04 ] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 6d346aa..801fd86 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ buildscript { mavenCentral() // Since 2.5.4, the publish repository has been shifted from Jcenter to Maven Central. } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' - classpath 'me.2bab:scratchpaper:3.0.0' // Since 2.5.4, the artifactId of ScratchPaper changed from scratch-paper to scratchpaper + classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'me.2bab:scratchpaper:3.1.0' // Since 2.5.4, the artifactId of ScratchPaper changed from scratch-paper to scratchpaper } } ``` @@ -101,7 +101,8 @@ ScratchPaper is only supported & tested on LATEST ONE Minor versions of Android AGP Version|Latest Support Version -----------|----------------- -7.0.x | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/me.2bab/scratchpaper/badge.svg)](https://search.maven.org/artifact/me.2bab/scratchpaper) +7.1.x | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/me.2bab/scratchpaper/badge.svg)](https://search.maven.org/artifact/me.2bab/scratchpaper) +7.0.x | 3.0.0 4.2.x | 2.6.0 4.1.x | 2.5.4 4.0.x | 2.5.3 diff --git a/README_zh.md b/README_zh.md index ec3e18a..b83b38d 100644 --- a/README_zh.md +++ b/README_zh.md @@ -38,8 +38,8 @@ buildscript { mavenCentral() // 从 2.5.4 开始,ScratchPaper 从 Jcenter 迁移到了 Maven Central } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' - classpath 'me.2bab:scratchpaper:3.0.0' // 从 2.5.4 开始,ScratchPaper 的 artifactId 从 scratch-paper 改为 scratchpaper + classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'me.2bab:scratchpaper:3.1.0' // 从 2.5.4 开始,ScratchPaper 的 artifactId 从 scratch-paper 改为 scratchpaper } } ``` @@ -99,8 +99,8 @@ scratchPaper { AGP Version|Latest Support Version -----------|----------------- -7.0.x | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/me.2bab/scratchpaper/badge.svg)](https://search.maven.org/artifact/me.2bab/scratchpaper) -4.2.x | 2.6.0 +7.1.x | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/me.2bab/scratchpaper/badge.svg)](https://search.maven.org/artifact/me.2bab/scratchpaper) +7.0.x | 3.0.0 4.1.x | 2.5.4 4.0.x | 2.5.3 3.6.x | 2.5.1 diff --git a/publish_to_local.sh b/publish_to_local.sh index 41517e0..fba387f 100755 --- a/publish_to_local.sh +++ b/publish_to_local.sh @@ -1 +1 @@ -./gradlew clean :scratch-paper:plugin:assemble :scratch-paper:plugin:publishToMavenLocal \ No newline at end of file +./gradlew clean :scratch-paper:plugin:assemble :scratch-paper:plugin:publishSPPluginPublicationToMavenLocal \ No newline at end of file diff --git a/scratch-paper/buildSrc/src/main/kotlin/BuildConfig.kt b/scratch-paper/buildSrc/src/main/kotlin/BuildConfig.kt index 4ce16e7..4065914 100644 --- a/scratch-paper/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/scratch-paper/buildSrc/src/main/kotlin/BuildConfig.kt @@ -1,7 +1,7 @@ object BuildConfig { object Versions { - const val scratchPaperVersion = "3.0.0" + const val scratchPaperVersion = "3.1.0" } } \ No newline at end of file diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts index 0135079..f66bc36 100644 --- a/test-app/build.gradle.kts +++ b/test-app/build.gradle.kts @@ -11,7 +11,7 @@ android { minSdk = 23 targetSdk = 31 versionCode = 1 - versionName = "3.0.0" + versionName = "3.1.0" } buildTypes {