Merge pull request #334 from KasperskyLab/small_improvements

Small improvements
KasperskyLab · Nov 26, 2021 · c105b6a · c105b6a
2 parents 8173f84 + aeef017
commit c105b6a
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 5 deletions.
diff --git a/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts
@@ -9,6 +9,10 @@ plugins {
 android {
     testBuildType = "debug"
 
+    defaultConfig {
+        multiDexEnabled = true
+    }
+
     variantFilter {
         if (name != testBuildType) {
             ignore = true

diff --git a/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts
@@ -12,7 +12,7 @@ configure<BaseExtension> {
     }
 
     defaultConfig {
-        minSdk = 21
+        minSdk = 18
         targetSdk = 30
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -25,6 +25,7 @@ androidXCore = "androidx.core:core:1.7.0"
 appcompat = "androidx.appcompat:appcompat:1.4.0"
 material = "com.google.android.material:material:1.4.0"
 constraint = "androidx.constraintlayout:constraintlayout:2.1.2"
+multidex = "androidx.multidex:multidex:2.0.1"
 
 lifecycleViewModelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 lifecycleLiveDataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }

diff --git a/samples/adbserver-sample/build.gradle.kts b/samples/adbserver-sample/build.gradle.kts
@@ -12,4 +12,5 @@ dependencies {
     implementation(libs.kotlinStdlib)
     implementation(libs.appcompat)
     implementation(projects.adbServer.adbserverDevice)
+    implementation(libs.multidex)
 }
diff --git a/samples/adbserver-sample/src/main/AndroidManifest.xml b/samples/adbserver-sample/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -22,4 +23,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/samples/kaspresso-allure-support-sample/build.gradle.kts b/samples/kaspresso-allure-support-sample/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     implementation(libs.appcompat)
     implementation(libs.material)
     implementation(libs.constraint)
+    implementation(libs.multidex)
 
     androidTestImplementation(projects.kaspresso)
     androidTestImplementation(projects.allureSupport)

diff --git a/samples/kaspresso-allure-support-sample/src/main/AndroidManifest.xml b/samples/kaspresso-allure-support-sample/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
         tools:ignore="ScopedStorage" />
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:label="@string/app_name"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">

diff --git a/samples/kaspresso-compose-support-sample/build.gradle.kts b/samples/kaspresso-compose-support-sample/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
 
 android {
     defaultConfig {
+        minSdk = 21
+
         applicationId = "com.kaspersky.kaspresso.composesupport.com.kaspersky.kaspresso.composesupport.sample"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"

diff --git a/samples/kaspresso-sample/build.gradle.kts b/samples/kaspresso-sample/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
     implementation(libs.appcompat)
     implementation(libs.material)
     implementation(libs.constraint)
+    implementation(libs.multidex)
 
     androidTestImplementation(libs.junit)
     androidTestImplementation(projects.kaspresso)

diff --git a/samples/kaspresso-sample/src/main/AndroidManifest.xml b/samples/kaspresso-sample/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" tools:ignore="ProtectedPermissions"/>
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:requestLegacyExternalStorage="true"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"

diff --git a/samples/kaspresso-sample/src/main/kotlin/com/kaspersky/kaspressample/web/WebViewActivity.kt b/samples/kaspresso-sample/src/main/kotlin/com/kaspersky/kaspressample/web/WebViewActivity.kt
@@ -1,5 +1,6 @@
 package com.kaspersky.kaspressample.web
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.os.Build
 import android.os.Bundle
@@ -20,6 +21,7 @@ class WebViewActivity : AppCompatActivity() {
             webViewClient = object : WebViewClient() {
 
                 @TargetApi(Build.VERSION_CODES.N)
+                @SuppressLint("NewApi")
                 override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
                     view.loadUrl(request.url.toString())
                     return true

diff --git a/samples/kautomator-sample-app-upgrade/build.gradle.kts b/samples/kautomator-sample-app-upgrade/build.gradle.kts
@@ -11,6 +11,7 @@ android {
 
 dependencies {
     implementation(libs.appcompat)
+    implementation(libs.multidex)
 
     androidTestImplementation(projects.kaspresso)
 }
diff --git a/samples/kautomator-sample-app-upgrade/src/main/AndroidManifest.xml b/samples/kautomator-sample-app-upgrade/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -24,4 +25,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/samples/kautomator-sample/build.gradle.kts b/samples/kautomator-sample/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     implementation(libs.appcompat)
     implementation(libs.material)
     implementation(libs.constraint)
+    implementation(libs.multidex)
 
     androidTestImplementation(projects.kaspresso)
 }
diff --git a/samples/kautomator-sample/src/main/AndroidManifest.xml b/samples/kautomator-sample/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -27,4 +28,4 @@
         <activity android:name=".scroll.ScrollActivity" />
     </application>
 
-</manifest>
+</manifest>
diff --git a/static-analysis/config/detekt/config.yml b/static-analysis/config/detekt/config.yml
@@ -514,7 +514,7 @@ style:
     maxJumpCount: 1
   MagicNumber:
     active: true
-    excludes: ['**/test/**', '**/androidTest/**', '**/sharedTest/**', '**/*.Test.kt', '**/*.Spec.kt', '**/*.Spek.kt']
+    excludes: ['**/test/**', '**/androidTest/**', '**/sharedTest/**', '**/*.Test.kt', '**/*.Spec.kt', '**/*.Spek.kt', '**/*.kts']
     ignoreNumbers: ['-1', '0', '1', '2']
     ignoreHashCodeFunction: true
     ignorePropertyDeclaration: false

diff --git a/tutorial/build.gradle.kts b/tutorial/build.gradle.kts
@@ -4,6 +4,9 @@ plugins {
 
 android {
     defaultConfig {
+        // remove after upgrading to 1.4
+        minSdk = 21
+
         applicationId = "com.kaspersky.kaspresso.tutorial"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"