Merge pull request 'MAN-2775: Добавлены правила' (#29) from MAN-BuildScript into detached4

Reviewed-on: #29

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

@@ -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"
+            mainClass.set("-jar")
             workingDir = rootDir
             args = listOfNotNull(
                     configurations.getByName("apiGenerator").asPath,

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

@@ -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"
+            mainClass.set("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.outputLocation.set(getCpdReportFile())
                 ignoreFailures = true
                 source = getSources(extension.excludes)
             }

gradle/scripts/stringGenerator.gradle

@@ -2,7 +2,7 @@ import groovy.json.JsonSlurper
 import groovy.xml.MarkupBuilder
 
 task stringGenerator {
-    generate(android.languageMap, project)
+    generate(android.languageMap, project.rootProject.findProject(":core:strings"))
     println("Strings generated!")
 }
 
@@ -32,6 +32,11 @@ private def generate(Map<String, String> sources, Project project) {
         }
 
         def stringsFile = getFile(key, key == defaultLang, project)
+        if (!stringsFile.exists()) {
+            stringsFile.parentFile.mkdirs()
+            stringsFile.createNewFile()
+        }
+
         stringsFile.write(sw.toString(), "UTF-8")
     }
 }

proguard/common.pro

@@ -7,3 +7,7 @@
 -include rules/kaspersky.pro
 -include rules/appsflyer.pro
 -include rules/moshi.pro
+-include rules/androidx_security.pro
+-include rules/kotlinx_serialization.pro
+-include rules/workmanager.pro
+-include rules/navigation.pro

proguard/rules/kotlinx_serialization.pro

@@ -0,0 +1,21 @@
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.AnnotationsKt
+
+-keepclassmembers class kotlinx.serialization.json.** { *** Companion; }
+-keepclasseswithmembers class kotlinx.serialization.json.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keepclasseswithmembers class **$$serializer {
+    static **$$serializer INSTANCE;
+}
+
+-keepclassmembers @kotlinx.serialization.Serializable class ** {
+    static **$serializer INSTANCE;
+    static kotlinx.serialization.KSerializer serializer(...);
+    *** Companion;
+    *** INSTANCE;
+    kotlinx.serialization.KSerializer serializer();
+}
+
+-keep @kotlinx.serialization.Serializable class * { *; }

proguard/rules/navigation.pro

@@ -0,0 +1,4 @@
+-keepnames class * implements com.manzherok.mobile.corenavigation.Route
+-keep class * implements com.manzherok.mobile.corenavigation.Route {
+    public java.lang.String getName();
+}

proguard/rules/workmanager.pro

@@ -0,0 +1,8 @@
+-keep class * extends androidx.work.Worker { *; }
+-keep class * extends androidx.work.CoroutineWorker { *; }
+-keep class * extends androidx.work.ListenableWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keepclasseswithmembers class * {
+    @dagger.assisted.AssistedInject <init>(...);
+}

xcode/config_generator/build_options_helper

@@ -1 +1 @@
-Subproject commit a8f072f216684bd7f5563c0211f71d6637a5f92d
+Subproject commit e591d65722d78918c84c4eeda3df8c4012e75323

xcode/fastlane/touchlane/lib/touchlane/configuration_type.rb

@@ -3,15 +3,13 @@ module Touchlane
     DEVELOPMENT = "development"
     ENTERPRISE = "enterprise"
     APP_STORE = "appstore"
-    ADHOC = "adhoc"
 
     DEVELOPMENT_PREFIX = "Standard"
     ENTERPRISE_PREFIX = "Enterprise"
     APP_STORE_PREFIX = "AppStore"
-    ADHOC_PREFIX = "AdHoc"
 
-    private_constant :DEVELOPMENT, :ENTERPRISE, :APP_STORE, :ADHOC_PREFIX
-    private_constant :DEVELOPMENT_PREFIX, :ENTERPRISE_PREFIX, :APP_STORE_PREFIX, :ADHOC_PREFIX
+    private_constant :DEVELOPMENT, :ENTERPRISE, :APP_STORE
+    private_constant :DEVELOPMENT_PREFIX, :ENTERPRISE_PREFIX, :APP_STORE_PREFIX
 
     def initialize(type)
       @type = type
@@ -32,10 +30,6 @@ module Touchlane
           @export_method = "app-store"
           @configuration = "AppStore"
           @prefix = APP_STORE_PREFIX
-      when ADHOC
-          @export_method = type
-          @export_method = "ad-hoc"
-          @prefix = ADHOC_PREFIX
       else
         raise "Unknown type passed #{type}"
       end
@@ -53,11 +47,9 @@ module Touchlane
         from_type(APP_STORE)
       when lane_name.start_with?(DEVELOPMENT_PREFIX)
         from_type(DEVELOPMENT)
-      when lane_name.start_with?(ADHOC_PREFIX)
-        from_type(ADHOC)
       else
         raise "Unable to map #{lane_name} to #{ConfigurationType.class}."
-        + "Available prefixes: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}, #{ADHOC_PREFIX}"
+        + "Available prefixes: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}"
       end
     end
 
@@ -73,11 +65,9 @@ module Touchlane
         from_type(ENTERPRISE)
       when APP_STORE_PREFIX
         from_type(APP_STORE)
-      when ADHOC_PREFIX
-        from_type(ADHOC)
       else
         raise "Unable to map #{account_type} to #{ConfigurationType.class}."
-        + "Available account types: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}, #{ADHOC_PREFIX}"
+        + "Available account types: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}"
       end
     end