feat(sdds-acore/theme-builder): Migrated to new json scheme (#29)

salute-developers · Apr 25, 2024 · 01e69d2 · 01e69d2
1 parent 3fb4fb5
commit 01e69d2
Show file tree

Hide file tree

Showing 52 changed files with 971 additions and 910 deletions.
diff --git a/build-system/detekt-rules/src/main/kotlin/com/sdds/detekt/rules/TodoPatternRule.kt b/build-system/detekt-rules/src/main/kotlin/com/sdds/detekt/rules/TodoPatternRule.kt
@@ -40,9 +40,8 @@ internal class TodoPatternRule(config: Config = Config.empty) : Rule(config) {
     }
 
     private companion object {
-        const val issuePattern = "[A-Z]{2,}-\\d+"
         val todoCommentPattern = Regex("//\\s*todo.*", RegexOption.IGNORE_CASE)
-        val todoPattern = Regex("// TODO: $issuePattern.*")
+        val todoPattern = Regex("// TODO: https://github.com/salute-developers/plasma-android/issues/\\d+")
         const val MESSAGE = "Укажите issue, например: " +
             "// TODO: https://github.com/salute-developers/plasma/issues/0"
     }

diff --git a/playground/theme-builder/build.gradle.kts b/playground/theme-builder/build.gradle.kts
@@ -13,7 +13,7 @@ android {
 }
 
 configure<ThemeBuilderExtension> {
-    themeUrl.set("file://${projectDir.path}/new_theme_scheme.json")
+    themeUrl.set("file://${projectDir.path}/json/plasma_b2c.zip")
     target.set(ThemeBuilderTarget.ALL)
     packageName.set("com.sdds.playground.themebuilder.tokens")
 }

diff --git a/playground/theme-builder/json/plasma_b2c.zip b/playground/theme-builder/json/plasma_b2c.zip
diff --git a/playground/theme-builder/new_theme_scheme.json b/playground/theme-builder/new_theme_scheme.json
diff --git a/...-core/plugin_theme_builder/src/main/kotlin/com/sdds/plugin/themebuilder/FetchThemeTask.kt b/...-core/plugin_theme_builder/src/main/kotlin/com/sdds/plugin/themebuilder/FetchThemeTask.kt
@@ -21,7 +21,7 @@ internal abstract class FetchThemeTask : DefaultTask() {
     abstract val url: Property<String>
 
     /**
-     * Местоположение файла с темой после загрузки
+     * Местоположение архива с темой после загрузки
      */
     @get:OutputFile
     abstract val themeFile: RegularFileProperty
@@ -36,7 +36,7 @@ internal abstract class FetchThemeTask : DefaultTask() {
                 val themeJSON = themeFile.get().asFile
                 themeJSON.writeBytes(themeContent)
             }.onFailure {
-                logger.error("Can't fetch theme json", it)
+                logger.error("Can't fetch theme", it)
                 throw it
             }
     }