Merge pull request #420 from UseHover/qa

v1.9.0.6(120)

.github/workflows/qa-release.yml

@@ -50,7 +50,7 @@ jobs:
         uses: eskatos/[email protected]
         with:
           # Can be overridden with the desired gradle version
-          gradle-version: 7.0.2
+          gradle-version: 7.2
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

.gitignore

@@ -22,12 +22,10 @@ app/release
 .cxx
 /hover.sdk
 *.apk
-<<<<<<< HEAD
 .project
 .settings/
 app/.classpath
 app/.project
 app/.settings/
-=======
->>>>>>> master
 /app/src/main/res/values/app_keys.xml
+

app/build.gradle

@@ -36,15 +36,14 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdk 31
 
     defaultConfig {
         applicationId "com.hover.stax"
-        minSdkVersion 18
-        targetSdkVersion 30
-        versionCode 111
-        versionName "1.8.1.6"
+        minSdk 21
+        targetSdk 31
+        versionCode 120
+        versionName "1.9.0.6"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -62,6 +61,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = "1.8"
+        useIR = true
+    }
+
     buildTypes {
         debug {
             buildConfigField "String", "SELF_DESTRUCT", "\"1622450539\""
@@ -91,11 +95,21 @@ android {
     lintOptions {
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
-        abortOnError false
     }
 
     buildFeatures {
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
+    }
+
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
     }
 }
 
@@ -104,26 +118,31 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Google
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation "androidx.biometric:biometric:1.1.0"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
-    implementation 'androidx.work:work-runtime-ktx:2.6.0'
-    kapt "androidx.lifecycle:lifecycle-common-java8:2.4.0"
+    implementation 'androidx.work:work-runtime-ktx:2.7.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
+    implementation 'androidx.activity:activity-compose:1.4.0'
+    kapt "androidx.lifecycle:lifecycle-common-java8:2.4.1"
 
-    implementation "androidx.room:room-runtime:2.3.0"
-    kapt "androidx.room:room-compiler:2.3.0"
-    androidTestImplementation "androidx.room:room-testing:2.3.0"
-
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
+    //compose
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_version"
+
     //logging
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
@@ -134,12 +153,12 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging'
     implementation 'com.google.firebase:firebase-inappmessaging-display'
     implementation 'com.google.firebase:firebase-config'
-    implementation 'com.google.android.play:core:1.10.2'
+    implementation 'com.google.android.play:core:1.10.3'
     implementation 'com.google.firebase:firebase-perf'
     implementation 'com.google.firebase:firebase-firestore-ktx'
 
     //auth
-    implementation 'com.google.android.gms:play-services-auth:19.2.0'
+    implementation 'com.google.android.gms:play-services-auth:20.1.0'
     implementation 'com.google.firebase:firebase-auth-ktx'
 
     implementation 'com.amplitude:android-sdk:2.23.2'
@@ -150,15 +169,17 @@ dependencies {
     implementation 'com.appsflyer:af-android-sdk:6.2.3'
     implementation 'com.android.installreferrer:installreferrer:2.2'
 
-    // Kotlin
-    implementation "androidx.room:room-ktx:2.3.0"
-    implementation "androidx.core:core-ktx:1.6.0"
+    def roomVersion = "2.4.1"
+    implementation "androidx.room:room-ktx:$roomVersion"
+    implementation "androidx.room:room-runtime:$roomVersion"
+    kapt "androidx.room:room-compiler:$roomVersion"
+    androidTestImplementation "androidx.room:room-testing:$roomVersion"
+
+    implementation "androidx.core:core-ktx:1.7.0"
 
     //di
-    def koin_version= "2.2.2"
-    implementation "org.koin:koin-androidx-scope:$koin_version"
-    implementation "org.koin:koin-androidx-viewmodel:$koin_version"
-    implementation "org.koin:koin-androidx-fragment:$koin_version"
+    def koin_version= "3.1.5"
+    implementation "io.insert-koin:koin-android:$koin_version"
 
     // Tests
     testImplementation 'junit:junit:4.13.2'
@@ -167,11 +188,16 @@ dependencies {
 
     // Hover SDK
     debugImplementation project(":hover.sdk")
-    def sdk_version = "2.0.0-stax-1.5.7.0-pro"
+    def sdk_version = "2.0.0-stax-1.9.0.3-pro"
 
     releaseImplementation "com.hover:android-sdk:$sdk_version"
+
     debugImplementation 'com.android.volley:volley:1.2.1'
-    debugImplementation 'com.google.android.gms:play-services-analytics:17.0.1'
+    debugImplementation 'com.google.android.gms:play-services-analytics:18.0.1'
 
     debugImplementation 'io.sentry:sentry-android:4.3.0'
-}
+
+    //compose
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+}