From 2ed21b32c9e77da5f957cfbf9d73a0a563b8511c Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 8 Oct 2018 03:14:40 -0400 Subject: [PATCH] Enhancement/public xml (#171) * Test gitignore with public xml * Fix spacing --- .gitignore | 1 + about/src/main/res-public/values/public.xml | 4 - adapter/src/main/res-public/values/public.xml | 4 - artifacts.gradle | 8 +- .../src/main/res-public/values/public.xml | 4 - core-ui/src/main/res-public/values/public.xml | 10 -- core/src/main/res-public/values/public.xml | 118 ------------------ .../src/main/res-public/values/public.xml | 19 --- .../src/main/res-public/values/public.xml | 7 -- .../src/main/res-public/values/public.xml | 4 - 10 files changed, 7 insertions(+), 172 deletions(-) delete mode 100644 about/src/main/res-public/values/public.xml delete mode 100644 adapter/src/main/res-public/values/public.xml delete mode 100644 colorpicker/src/main/res-public/values/public.xml delete mode 100644 core-ui/src/main/res-public/values/public.xml delete mode 100644 core/src/main/res-public/values/public.xml delete mode 100644 kpref-activity/src/main/res-public/values/public.xml delete mode 100644 mediapicker/src/main/res-public/values/public.xml delete mode 100644 searchview/src/main/res-public/values/public.xml diff --git a/.gitignore b/.gitignore index 6f35f6b81..d741202dd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /build /captures .externalNativeBuild +**/public.xml \ No newline at end of file diff --git a/about/src/main/res-public/values/public.xml b/about/src/main/res-public/values/public.xml deleted file mode 100644 index 3739dd184..000000000 --- a/about/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/adapter/src/main/res-public/values/public.xml b/adapter/src/main/res-public/values/public.xml deleted file mode 100644 index 4d16c2a43..000000000 --- a/adapter/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/artifacts.gradle b/artifacts.gradle index 12dd3faea..c0c344a2e 100644 --- a/artifacts.gradle +++ b/artifacts.gradle @@ -31,6 +31,8 @@ artifacts { // We assume resources within res-public are public task generatepublicxml { + println "Generating public XML" + def resDir = project.projectDir.absolutePath + "/src/main/res-public" def publicFolder = file(resDir + "/values") @@ -64,7 +66,7 @@ task generatepublicxml { ) { // Leave file comment destXmlMkp.yield "\r\n" - destXmlMkp.comment("AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task") + destXmlMkp.comment("AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task") if (tree.isEmpty()) "public"("name": "dummy", "type": "id") @@ -96,4 +98,6 @@ task generatepublicxml { } } } -} \ No newline at end of file +} + +build.dependsOn generatepublicxml \ No newline at end of file diff --git a/colorpicker/src/main/res-public/values/public.xml b/colorpicker/src/main/res-public/values/public.xml deleted file mode 100644 index 4d16c2a43..000000000 --- a/colorpicker/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml deleted file mode 100644 index 3d0b8d274..000000000 --- a/core-ui/src/main/res-public/values/public.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml deleted file mode 100644 index 485be78c4..000000000 --- a/core/src/main/res-public/values/public.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kpref-activity/src/main/res-public/values/public.xml b/kpref-activity/src/main/res-public/values/public.xml deleted file mode 100644 index bd4f615e1..000000000 --- a/kpref-activity/src/main/res-public/values/public.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mediapicker/src/main/res-public/values/public.xml b/mediapicker/src/main/res-public/values/public.xml deleted file mode 100644 index cadfa0720..000000000 --- a/mediapicker/src/main/res-public/values/public.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/searchview/src/main/res-public/values/public.xml b/searchview/src/main/res-public/values/public.xml deleted file mode 100644 index 4d16c2a43..000000000 --- a/searchview/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file