Merge branch 'develop'

# Conflicts:
#	gradle.properties

Author: umbrellait-artem-petrov

.gitignore

@@ -43,12 +43,6 @@ out/
 .gradle/
 build/
 
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
 # Log Files
 *.log
 
@@ -59,7 +53,6 @@ proguard/
 captures/
 
 # IntelliJ
-*.iml
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
@@ -78,7 +71,6 @@ captures/
 #*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
 .cxx/
 
 # Google Services (e.g. APIs or Firebase)
@@ -232,7 +224,6 @@ fabric.properties
 
 ### macOS ###
 # General
-.DS_Store
 .AppleDouble
 .LSOverride
 
@@ -271,7 +262,6 @@ Temporary Items
 # Generated files
 
 # Gradle files
-.gradle
 
 # Signing files
 .signing/

.idea/codeStyles/Project.xml

@@ -4,17 +4,17 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
+        maven { url("https://plugins.gradle.org/m2/") }
+        maven { url("https://developer.huawei.com/repo/") }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath "com.android.tools.build:gradle:4.1.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
-        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.google.gms:google-services:4.3.10'
 //        classpath "io.github.gradle-nexus.publish-plugin:1.0.0"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.huawei.agconnect:agcp:1.6.0.300'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -31,9 +31,12 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://developer.huawei.com/repo/' }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+apply from: 'dependencies.gradle'

build.gradle

@@ -0,0 +1,30 @@
+ext {
+
+    sdkDependencies = [
+        kotlin_stdlib: 'org.jetbrains.kotlin:kotlin-stdlib:1.4.20',
+        androidx_core_ktx: 'androidx.core:core-ktx:1.7.0',
+        androidx_annotations: 'androidx.annotation:annotation:1.3.0',
+        firebase_bom: 'com.google.firebase:firebase-bom:26.1.1',
+        firebase_messaging: 'com.google.firebase:firebase-messaging:21.0.0',
+        gms_play_services_basement: 'com.google.android.gms:play-services-basement:18.0.0',
+        gms_play_services_base: 'com.google.android.gms:play-services-base:18.0.1',
+        gms_play_services_ads_identifier: 'com.google.android.gms:play-services-ads-identifier:18.0.1',
+        kotlinx_coroutines_core: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2',
+        kotlinx_coroutines_android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0',
+        volley: 'com.android.volley:volley:1.2.1',
+        gson: 'com.google.code.gson:gson:2.8.7',
+        room: 'androidx.room:room-runtime:2.4.1',
+        room_compiler: 'androidx.room:room-compiler:2.4.1',
+        work_manager: 'androidx.work:work-runtime-ktx:2.7.1',
+        androidx_lifecycle: 'androidx.lifecycle:lifecycle-process:2.3.1',
+        hms_push: 'com.huawei.hms:push:6.1.0.300',
+        hms_ads_identifier: 'com.huawei.hms:ads-identifier:3.4.39.302'
+    ]
+
+    testDependencies = [
+        junit: 'junit:junit:4.13.2',
+        androidx_junit: 'androidx.test.ext:junit:1.1.3',
+        espresso: 'androidx.test.espresso:espresso-core:3.4.0'
+    ]
+
+}

dependencies.gradle

@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # SDK version property
-SDK_VERSION_NAME=2.0.0-alpha
+SDK_VERSION_NAME=2.0.1

gradle.properties

@@ -0,0 +1 @@
+/build

mindbox-firebase/.gitignore

@@ -0,0 +1,28 @@
+apply from: "${rootProject.projectDir}/modulesCommon.gradle"
+
+android {
+    defaultConfig {
+        consumerProguardFiles "consumer-rules.pro",
+                "${rootProject.projectDir}/proguard/proguard-gson.pro",
+                "${rootProject.projectDir}/proguard/proguard-firebase.pro",
+                "${rootProject.projectDir}/proguard/proguard-kotlin.pro"
+    }
+}
+
+dependencies {
+    implementation project(path: ':sdk')
+
+    implementation sdkDependencies.androidx_core_ktx
+    implementation sdkDependencies.kotlinx_coroutines_core
+
+    implementation sdkDependencies.gson
+
+    // Firebase messaging
+    implementation platform(sdkDependencies.firebase_bom)
+    implementation sdkDependencies.firebase_messaging
+    implementation sdkDependencies.gms_play_services_base
+    implementation sdkDependencies.gms_play_services_basement
+
+    // Ads
+    implementation sdkDependencies.gms_play_services_ads_identifier
+}

mindbox-firebase/build.gradle

@@ -0,0 +1,3 @@
+ARTIFACT_ID=mindbox-firebase
+ARTIFACT_NAME=Mindbox Firebase Push SDK
+MIN_SDK_VERSION=16

mindbox-firebase/consumer-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile