diff --git a/arch-annotation/build.gradle.kts b/arch-annotation/build.gradle.kts index 7c67fc35..e57f392d 100644 --- a/arch-annotation/build.gradle.kts +++ b/arch-annotation/build.gradle.kts @@ -4,6 +4,7 @@ plugins { `java-library` kotlin("jvm") `maven-publish` + signing id("qmui-publish") } diff --git a/arch-compiler/build.gradle.kts b/arch-compiler/build.gradle.kts index cb98ca2a..da860209 100644 --- a/arch-compiler/build.gradle.kts +++ b/arch-compiler/build.gradle.kts @@ -3,6 +3,7 @@ import com.qmuiteam.plugin.Dep plugins { `java-library` `maven-publish` + signing id("qmui-publish") } version = Dep.QMUI.archVer diff --git a/arch/build.gradle.kts b/arch/build.gradle.kts index 2a2558f7..6b9782c8 100644 --- a/arch/build.gradle.kts +++ b/arch/build.gradle.kts @@ -4,6 +4,7 @@ plugins { id("com.android.library") kotlin("android") `maven-publish` + signing id("qmui-publish") } diff --git a/compose-core/build.gradle.kts b/compose-core/build.gradle.kts index 26e0ca9e..27af5da7 100644 --- a/compose-core/build.gradle.kts +++ b/compose-core/build.gradle.kts @@ -5,6 +5,7 @@ plugins { id("com.android.library") kotlin("android") `maven-publish` + signing id("qmui-publish") } diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 703fb176..5f3a56db 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -5,6 +5,7 @@ plugins { id("com.android.library") kotlin("android") `maven-publish` + signing id("qmui-publish") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d33b6fdf..d17270f8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/photo-coil/build.gradle.kts b/photo-coil/build.gradle.kts index b3c9f6e5..69888982 100644 --- a/photo-coil/build.gradle.kts +++ b/photo-coil/build.gradle.kts @@ -4,6 +4,7 @@ plugins { id("com.android.library") kotlin("android") `maven-publish` + signing id("qmui-publish") } diff --git a/photo/build.gradle.kts b/photo/build.gradle.kts index 96e1a88f..12ed3f86 100644 --- a/photo/build.gradle.kts +++ b/photo/build.gradle.kts @@ -4,6 +4,7 @@ plugins { id("com.android.library") kotlin("android") `maven-publish` + signing id("qmui-publish") } diff --git a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt index bee502b1..3fd1df37 100644 --- a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt +++ b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt @@ -13,8 +13,8 @@ object Dep { object QMUI { const val group = "com.qmuiteam" - const val qmuiVer = "2.0.1" - const val archVer = "2.0.1_f_16" + const val qmuiVer = "2.1.0" + const val archVer = "2.1.0" const val typeVer = "0.1.0" const val composeCoreVer = "0.0.1" const val composeVer = "0.0.1" diff --git a/plugin/src/main/java/com/qmuiteam/plugin/QMUIPublish.kt b/plugin/src/main/java/com/qmuiteam/plugin/QMUIPublish.kt index d6ed5a88..b5edc31b 100644 --- a/plugin/src/main/java/com/qmuiteam/plugin/QMUIPublish.kt +++ b/plugin/src/main/java/com/qmuiteam/plugin/QMUIPublish.kt @@ -1,21 +1,18 @@ package com.qmuiteam.plugin +import com.android.build.gradle.LibraryExtension import org.gradle.api.Plugin import org.gradle.api.Project -import java.io.File -import java.util.* -import kotlin.io.* -import com.android.build.gradle.BaseExtension -import com.android.build.gradle.LibraryExtension import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication -import org.gradle.api.tasks.bundling.Jar -import org.gradle.api.tasks.javadoc.Javadoc import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.create +import org.gradle.plugins.signing.SigningExtension +import java.util.* +import kotlin.io.* -class QMUIPublish: Plugin { +class QMUIPublish : Plugin { override fun apply(project: Project) { val isAndroid = project.hasProperty("android") @@ -23,12 +20,13 @@ class QMUIPublish: Plugin { println("android") val android = project.extensions.getByName("android") as LibraryExtension android.publishing { - singleVariant("release"){ + singleVariant("release") { withJavadocJar() withSourcesJar() } } - }else{ + + } else { println("java/kotlin") project.configure { withSourcesJar() @@ -59,9 +57,14 @@ class QMUIPublish: Plugin { } publications { create("release") { - if(isAndroid){ + + project.configure { + sign(this@create) + } + + if (isAndroid) { from(components.getByName("release")) - }else{ + } else { from(components.getByName("java")) } @@ -72,6 +75,7 @@ class QMUIPublish: Plugin { pom { name.set("${project.group}:${project.name}") url.set("https://github.com/Tencent/QMUI_Android") + description.set("qmui android library.") licenses { license { name.set(properties.getProperty("license.name")) diff --git a/qmui/build.gradle.kts b/qmui/build.gradle.kts index cc4213a9..ee94c551 100644 --- a/qmui/build.gradle.kts +++ b/qmui/build.gradle.kts @@ -4,6 +4,7 @@ plugins { id("com.android.library") kotlin("android") `maven-publish` + signing id("qmui-publish") } diff --git a/qmui/src/main/java/com/qmuiteam/qmui/span/QMUICustomTypefaceSpan.java b/qmui/src/main/java/com/qmuiteam/qmui/span/QMUICustomTypefaceSpan.java index 8e011895..b46d4f5b 100644 --- a/qmui/src/main/java/com/qmuiteam/qmui/span/QMUICustomTypefaceSpan.java +++ b/qmui/src/main/java/com/qmuiteam/qmui/span/QMUICustomTypefaceSpan.java @@ -61,7 +61,7 @@ public class QMUICustomTypefaceSpan extends TypefaceSpan { int oldStyle; Typeface old = paint.getTypeface(); if (old == null) { - oldStyle = 0; + oldStyle = Typeface.NORMAL; } else { oldStyle = old.getStyle(); } diff --git a/type/build.gradle.kts b/type/build.gradle.kts index 0fe45534..ba153c99 100644 --- a/type/build.gradle.kts +++ b/type/build.gradle.kts @@ -4,6 +4,7 @@ plugins { id("com.android.library") kotlin("android") `maven-publish` + signing id("qmui-publish") }