From 8d80a1de62167bebbec0f7aae81c28b9125ed9b1 Mon Sep 17 00:00:00 2001 From: gryamy Date: Tue, 27 Apr 2021 16:39:15 +0800 Subject: [PATCH 1/3] Remove useless styles.xml file --- .../src/full/res/values/styles.xml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/values/styles.xml diff --git a/matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/values/styles.xml b/matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/values/styles.xml deleted file mode 100644 index 250ed5357..000000000 --- a/matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/values/styles.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - \ No newline at end of file From f803ecddf5f753f441b207f4efc486bee68c26ce Mon Sep 17 00:00:00 2001 From: gryamy Date: Tue, 27 Apr 2021 16:51:03 +0800 Subject: [PATCH 2/3] Remove unsupport attr --- .../src/full/res/layout-v21/activity_sqlitelint_base.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/layout-v21/activity_sqlitelint_base.xml b/matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/layout-v21/activity_sqlitelint_base.xml index 21c4ffed3..f87f46c52 100644 --- a/matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/layout-v21/activity_sqlitelint_base.xml +++ b/matrix/matrix-android/matrix-sqlite-lint/matrix-sqlite-lint-android-sdk/src/full/res/layout-v21/activity_sqlitelint_base.xml @@ -5,12 +5,9 @@ android:layout_height="match_parent"> + android:background="#ff009688"> Date: Thu, 20 May 2021 19:35:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?clean=E5=90=8E=EF=BC=8C=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=B7=B7=E6=B7=86=E5=8C=85=E6=97=A0dex?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- matrix/matrix-android/gradle.properties | 2 +- .../kotlin/com/tencent/matrix/plugin/task/MatrixTraceTask.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/matrix/matrix-android/gradle.properties b/matrix/matrix-android/gradle.properties index 89a460043..68c6f9023 100644 --- a/matrix/matrix-android/gradle.properties +++ b/matrix/matrix-android/gradle.properties @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro #Tue Jun 20 10:24:33 CST 2017 -VERSION_NAME_PREFIX=0.9.0 +VERSION_NAME_PREFIX=0.9.1 VERSION_NAME_SUFFIX= ## two options: Internal (for wechat), External (for public repo) PUBLISH_CHANNEL=Internal diff --git a/matrix/matrix-android/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/task/MatrixTraceTask.kt b/matrix/matrix-android/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/task/MatrixTraceTask.kt index ad72706fc..7cd1cafca 100644 --- a/matrix/matrix-android/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/task/MatrixTraceTask.kt +++ b/matrix/matrix-android/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/task/MatrixTraceTask.kt @@ -65,7 +65,6 @@ abstract class MatrixTraceTask : DefaultTask() { @get:Input abstract val traceClassOutputDirectory: Property - @get:OutputFiles abstract val classOutputs: ConfigurableFileCollection @get:OutputFile