From 7acdb2037c81f4c67c5f8ca908b58ec393ce4edd Mon Sep 17 00:00:00 2001 From: Karenkov Igor Date: Thu, 4 Jul 2019 12:32:20 +0300 Subject: [PATCH 1/4] Fix reading language map for Kotlin dsl (#124) It still works fine with groovy build script --- gradle/stringGenerator.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gradle/stringGenerator.gradle b/gradle/stringGenerator.gradle index 4dbdb18..26bc127 100644 --- a/gradle/stringGenerator.gradle +++ b/gradle/stringGenerator.gradle @@ -2,8 +2,6 @@ import groovy.json.JsonSlurper import groovy.xml.MarkupBuilder task stringGenerator { - final Map languageMap = android.extensions.findByName("languageMap") - generate(languageMap) println("Strings generated!") } @@ -91,4 +89,4 @@ private static String getDefaultLangKey(Map sources) { throw new IOException("Can't find default language") } -} \ No newline at end of file +} From c373f6f148d225a29a39ac06934c28bfc5d29391 Mon Sep 17 00:00:00 2001 From: Karenkov Igor Date: Fri, 5 Jul 2019 14:22:38 +0300 Subject: [PATCH 2/4] Fix languageMap for legacy projects (#125) --- gradle/stringGenerator.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/stringGenerator.gradle b/gradle/stringGenerator.gradle index 26bc127..a05b155 100644 --- a/gradle/stringGenerator.gradle +++ b/gradle/stringGenerator.gradle @@ -2,7 +2,7 @@ import groovy.json.JsonSlurper import groovy.xml.MarkupBuilder task stringGenerator { - generate(languageMap) + generate(android.languageMap) println("Strings generated!") } From 90e98175038088eaacd6b827c3ba8ef2e2ae4baa Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 19 Jul 2019 14:24:47 +0300 Subject: [PATCH 3/4] exclude build folder --- gradle/commonStaticAnalysis.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/commonStaticAnalysis.gradle b/gradle/commonStaticAnalysis.gradle index 8432daa..adbdbc9 100644 --- a/gradle/commonStaticAnalysis.gradle +++ b/gradle/commonStaticAnalysis.gradle @@ -33,7 +33,7 @@ detekt { config = files("$buildScriptsDir/kotlin/detekt-config.yml") // TODO add excludes from rootProject.extensions.findByName("staticAnalysisExcludes") - filters = ".*src/test.*,.*/resources/.*,.*/tmp/.*" + filters = ".*src/test.*,.*/resources/.*,.*/tmp/.*,.*/build/.*" reports { html { From a5bb4ad0cc8bed04f63210b6fd5495a1d70d7a4e Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 19 Jul 2019 14:44:17 +0300 Subject: [PATCH 4/4] ignore bad permissions for chrome os support --- lint/lint.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/lint/lint.xml b/lint/lint.xml index 4e33195..3709269 100644 --- a/lint/lint.xml +++ b/lint/lint.xml @@ -267,5 +267,6 @@ +