Merge branch 'refs/heads/dev-mir-stash' into feature/MIR-6740-nexus

migrate to gradle 8.0

gradle/plugins/build.gradle.kts

@@ -7,8 +7,7 @@ plugins {
 
 // The kotlin-dsl plugin requires a repository to be declared
 repositories {
-    mavenCentral()
-    google()
+    maven ("https://nexus.mir/repository/maven-proxy-group/")
 }
 
 dependencies {
@@ -27,7 +26,7 @@ dependencies {
 
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = "17"
 }
 
 gradlePlugin {

gradle/plugins/settings.gradle.kts

@@ -0,0 +1,7 @@
+pluginManagement {
+    repositories {
+        maven {
+            url = uri("https://nexus.mir/repository/maven-proxy-group/")
+        }
+    }
+}

gradle/plugins/src/main/java/apigen/ApiGeneratorPlugin.kt

@@ -19,7 +19,7 @@ abstract class ApiGeneratorPlugin : Plugin<Project> {
         with(target) {
             repositories {
                 maven {
-                    url = uri("https://maven.dev.touchin.ru")
+                    url = uri("https://nexus.mir/repository/maven-proxy-group/")
                     metadataSources {
                         artifact()
                     }
@@ -52,7 +52,7 @@ abstract class ApiGeneratorPlugin : Plugin<Project> {
         val outputLanguage = extension.outputLanguage ?: throw IllegalStateException("Configure output language code for api generator plugin")
 
         javaexec {
-            main = "-jar"
+            setMain("-jar")
             workingDir = rootDir
             args = listOfNotNull(
                     configurations.getByName("apiGenerator").asPath,

gradle/plugins/src/main/java/apigen/SwaggerApiGeneratorAndroidPlugin.kt

@@ -14,9 +14,9 @@ class SwaggerApiGeneratorAndroidPlugin : Plugin<Project> {
         const val GENERATOR_CONFIG = "swaggerCodegen"
         const val GENERATOR_VERSION = "3.0.34"
         const val TI_GENERATOR_CONFIG = "TIKotlin-swagger-codegen"
-        const val TI_GENERATOR_VERSION = "1.0.0"
+        const val TI_GENERATOR_VERSION = "1.0.1"
         const val GENERATOR_EXT_NAME = "swaggerApiGenerator"
-        const val MAVEN_URL = "https://maven.dev.touchin.ru"
+        const val MAVEN_URL = "https://nexus.mir/repository/maven-proxy-group/"
     }
 
     override fun apply(target: Project) {
@@ -63,7 +63,7 @@ class SwaggerApiGeneratorAndroidPlugin : Plugin<Project> {
             workingDir = file(taskWorkingDir)
             classpath = files(configurations.getByName(GENERATOR_CONFIG).asPath,
                     configurations.getByName(TI_GENERATOR_CONFIG).asPath)
-            main = "io.swagger.codegen.v3.cli.SwaggerCodegen"
+            setMain("io.swagger.codegen.v3.cli.SwaggerCodegen")
             args = listOfNotNull(
                 "generate",
                 "-i",

gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt

@@ -42,7 +42,7 @@ class CpdLinter : Linter {
             }
             tasks.withType<Cpd> {
                 reports.xml.required.set(true)
-                reports.xml.destination = getCpdReportFile()
+                reports.xml.setDestination(getCpdReportFile())
                 ignoreFailures = true
                 source = getSources(extension.excludes)
             }

gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt

@@ -24,7 +24,9 @@ class StaticAnalysisAndroidPlugin : StaticAnalysisPlugin() {
                     project.tasks.register("staticAnalysis") {
                         setupStaticAnalysisTask(
                                 linters = linters,
-                                buildVariant = applicationVariants.first { it.name.contains("Debug") }.name
+                                buildVariant = applicationVariants
+                                        .map { it.name.toLowerCase() }
+                                        .first { it.contains("debug") }
                         )
                     }
                 }
@@ -32,10 +34,14 @@ class StaticAnalysisAndroidPlugin : StaticAnalysisPlugin() {
         }
     }
 
-    override fun createLinters(): List<Linter> = listOf(
-            DetektLinter(),
-            CpdLinter(),
+    override fun createLinters(extension: StaticAnalysisExtension): List<Linter> = mutableListOf<Linter>().apply {
+        add(DetektLinter())
+        if (extension.isCpdLinterEnabled) {
+            CpdLinter()
+        }
+        if (extension.isAndroidLinterEnabled) {
             AndroidLinter()
-    )
+        }
+    }
 
 }

gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisBackendPlugin.kt

@@ -13,7 +13,7 @@ class StaticAnalysisBackendPlugin : StaticAnalysisPlugin() {
         }
     }
 
-    override fun createLinters(): List<Linter> = listOf(
+    override fun createLinters(extension: StaticAnalysisExtension): List<Linter> = listOf(
             CpdLinter(),
             DetektLinter()
     )

gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisExtension.kt

@@ -2,5 +2,7 @@ package static_analysis.plugins
 
 open class StaticAnalysisExtension(
         var excludes: String = "",
-        var buildScriptDir: String? = null
+        var buildScriptDir: String? = null,
+        var isCpdLinterEnabled: Boolean = true,
+        var isAndroidLinterEnabled: Boolean = false,
 )

gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisPlugin.kt

@@ -1,5 +1,6 @@
 package static_analysis.plugins
 
+import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
@@ -24,9 +25,10 @@ abstract class StaticAnalysisPlugin : Plugin<Project> {
 
             extensions.create<StaticAnalysisExtension>(STATIC_ANALYSIS_EXT_NAME)
 
-            val linters = createLinters()
+            val initData: StaticAnalysisExtension = extensions.getByType()
+            val linters = createLinters(initData)
 
-            linters.forEach { it.setupForProject(target, extensions.getByType()) }
+            linters.forEach { it.setupForProject(target, initData) }
 
             gradle.projectsEvaluated {
                 createStaticAnalysisTasks(target, linters)
@@ -39,7 +41,10 @@ abstract class StaticAnalysisPlugin : Plugin<Project> {
         dependsOn(*(linters.map { it.getTaskNames(project, buildVariant) }.flatten().toTypedArray()))
     }
 
-    abstract fun createLinters(): List<Linter>
+    abstract fun createLinters(extension: StaticAnalysisExtension): List<Linter>
     abstract fun createStaticAnalysisTasks(project: Project, linters: List<Linter>)
 
+    fun Project.staticAnalysis(configure: Action<StaticAnalysisExtension>): Unit =
+            (this as org.gradle.api.plugins.ExtensionAware).extensions.configure(STATIC_ANALYSIS_EXT_NAME, configure)
+
 }

proguard/rules/huawei.pro

@@ -0,0 +1,15 @@
+# https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/appgallerykit-getting-started-0000001055756858#section1448912915419
+
+-ignorewarnings
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keep class com.huawei.hianalytics.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}
+-keep interface com.huawei.hms.analytics.type.HAEventType{*;}
+-keep interface com.huawei.hms.analytics.type.HAParamType{*;}
+-keep class com.huawei.hms.analytics.HiAnalyticsInstance{*;}
+-keep class com.huawei.hms.analytics.HiAnalytics{*;}

static_analysis_configs/detekt-config.yml

@@ -64,7 +64,7 @@ complexity:
     ignoreSingleWhenExpression: true
     ignoreSimpleWhenEntries: true
   LabeledExpression:
-    active: true
+    active: false
   LargeClass:
     active: true
     threshold: 800