Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d80e35c authored by moezbhatti's avatar moezbhatti
Browse files

Upgrade sdk and androidx

parent e8399580

.travis.yml

+2 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ notifications: 


env:

  global:

    - COMPILE_API_LEVEL=27

    - COMPILE_API_LEVEL=29

    - EMULATOR_API_LEVEL=24              # It seems emulator levels 25,26,27 from main repos have google_apis by default, and do not support armeabi-v7a. Check commit comment.

    - EMULATOR_TAG=default               # Possible values are default, google_apis, android-tv, android-wear, android-wear-cn

    - EMULATOR_ABI=armeabi-v7a           # Default is armeabi-v7a, possible options are: x86, x86_64, mips, arm64-v8a, armeabi-v7a. Note: check commit comment

    - EMULATOR_NAME=qksms3

    - ANDROID_BUILD_TOOLS_VERSION=28.0.3 # Match build-tools version used in build.gradle

    - ANDROID_BUILD_TOOLS_VERSION=29.0.2 # Match build-tools version used in build.gradle

    - EMULATOR="system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_TAG};${EMULATOR_ABI}" # Used to install/create emulator



android:

build.gradle

+4 −4
Original line number Diff line number Diff line 
// Top-level build file where you can add configuration options common to all sub-projects/modules.



buildscript {

    ext.androidx_appcompat_version = '1.0.2'

    ext.androidx_appcompat_version = '1.1.0'

    ext.androidx_constraintlayout_version = '1.1.3'

    ext.androidx_core_version = '1.0.1'

    ext.androidx_core_version = '1.1.0'

    ext.androidx_emoji_version = '1.0.0'

    ext.androidx_exifinterface_version = '1.0.0'

    ext.androidx_testrunner_version = '1.1.0-alpha3'

    ext.androidx_viewpager_version = '1.0.0-alpha01'

    ext.androidx_viewpager_version = '1.0.0-beta05'

    ext.autodispose_version = '1.3.0'

    ext.conductor_version = '2.1.5'

    ext.coroutines_version = '1.2.2'
@@ -17,7 +17,7 @@ buildscript { 
    ext.glide_version = "4.8.0"

    ext.junit_version = '4.12'

    ext.kotlin_version = '1.3.31'

    ext.lifecycle_version = '2.0.0'

    ext.lifecycle_version = '2.1.0'

    ext.material_version = '1.0.0'

    ext.mockito_version = '2.18.3'

    ext.moshi_version = '1.8.0'

presentation/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ apply plugin: 'kotlin-android-extensions' 
apply plugin: 'kotlin-kapt'



android {

    compileSdkVersion 28

    buildToolsVersion "28.0.3"

    compileSdkVersion 29

    buildToolsVersion "29.0.2"

    flavorDimensions "analytics"



    defaultConfig {

        applicationId "com.moez.QKSMS"

        minSdkVersion 21

        targetSdkVersion 28

        targetSdkVersion 29

        versionCode 2202

        versionName "3.7.3"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ object ClipboardUtils { 
    fun copy(context: Context, string: String) {

        val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

        val clip = ClipData.newPlainText("SMS", string)

        clipboard.primaryClip = clip

        clipboard.setPrimaryClip(clip)

    }



}

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt

+4 −4
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ class ComposeActivityModule { 
        activity.intent.data?.let {

            val data = it.toString()

            address = when {

                it.scheme.startsWith("smsto") -> data.replace("smsto:", "")

                it.scheme.startsWith("mmsto") -> data.replace("mmsto:", "")

                it.scheme.startsWith("sms") -> data.replace("sms:", "")

                it.scheme.startsWith("mms") -> data.replace("mms:", "")

                it.scheme?.startsWith("smsto") == true -> data.replace("smsto:", "")

                it.scheme?.startsWith("mmsto") == true -> data.replace("mmsto:", "")

                it.scheme?.startsWith("sms") == true -> data.replace("sms:", "")

                it.scheme?.startsWith("mms") == true -> data.replace("mms:", "")

                else -> ""

            }