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

Commit 616c2f41 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊 Committed by Jonathan Klee
Browse files

apps: Update gradle deps

parent 83407d7a

app/build.gradle

+69 −69
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ def getSentryDsn = { -> 
}



android {

    compileSdk 34

    compileSdk = 35



    defaultConfig {

        applicationId "foundation.e.apps"

        minSdk 26

        targetSdk 30

        versionCode versionMajor * 1000000 + versionMinor * 1000 + versionPatch

        versionName "${versionMajor}.${versionMinor}.${versionPatch}"

        applicationId = "foundation.e.apps"

        minSdk = 30

        targetSdk = 35

        versionCode = versionMajor * 1000000 + versionMinor * 1000 + versionPatch

        versionName = "${versionMajor}.${versionMinor}.${versionPatch}"



        buildConfigField "String", "BUILD_ID", "\"${getGitHash() + "." + getDate()}\""

        buildConfigField("String", "SENTRY_DSN", "\"${getSentryDsn()}\"")
@@ -60,7 +60,7 @@ android { 
        manifestPlaceholders = [parentalControlPkgName: parentalControlPkgName]

        buildConfigField "String", "PACKAGE_NAME_PARENTAL_CONTROL", "\"${parentalControlPkgName}\""



        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

    }



    signingConfigs {
@@ -72,22 +72,22 @@ android { 
            keyPassword "platform"

        }

        releaseTestConfig {

            storeFile file("../keystore/proprietary.keystore")

            storePassword keystore_password

            keyAlias 'platform.test'

            keyPassword keystore_password

            storeFile = file("../keystore/proprietary.keystore")

            storePassword = keystore_password

            keyAlias = 'platform.test'

            keyPassword = keystore_password

        }

        releaseCommunityConfig {

            storeFile file("../keystore/proprietary.keystore")

            storePassword keystore_password

            keyAlias 'platform.dev'

            keyPassword keystore_password

            storeFile = file("../keystore/proprietary.keystore")

            storePassword = keystore_password

            keyAlias = 'platform.dev'

            keyPassword = keystore_password

        }

        releaseOfficialConfig {

            storeFile file("../keystore/proprietary.keystore")

            storePassword keystore_password

            keyAlias 'platform.stable'

            keyPassword keystore_password

            storeFile = file("../keystore/proprietary.keystore")

            storePassword = keystore_password

            keyAlias = 'platform.stable'

            keyPassword = keystore_password

        }

    }
@@ -111,28 +111,28 @@ android { 


    buildTypes {

        debug {

            signingConfig signingConfigs.debugConfig

            signingConfig = signingConfigs.debugConfig

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

        }

        release {

            minifyEnabled false

            minifyEnabled = false

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

        }

        releaseTest {

            minifyEnabled false

            signingConfig signingConfigs.releaseTestConfig

            minifyEnabled = false

            signingConfig = signingConfigs.releaseTestConfig

            sourceSets

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

        }

        releaseCommunity {

            minifyEnabled false

            signingConfig signingConfigs.releaseCommunityConfig

            minifyEnabled = false

            signingConfig = signingConfigs.releaseCommunityConfig

            sourceSets

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

        }

        releaseOfficial {

            minifyEnabled false

            signingConfig signingConfigs.releaseOfficialConfig

            minifyEnabled = false

            signingConfig = signingConfigs.releaseOfficialConfig

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

        }
@@ -143,21 +143,22 @@ android { 
        }

    }

    buildFeatures {

        viewBinding true

        aidl true

        buildConfig = true

        viewBinding = true

        aidl = true

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

        sourceCompatibility = JavaVersion.VERSION_17

        targetCompatibility = JavaVersion.VERSION_17

    }

    kotlinOptions {

        jvmTarget = '17'

    }

    lint {

        lintConfig file('lint.xml')

        lintConfig = file('lint.xml')

    }

    namespace 'foundation.e.apps'

    kotlin.sourceSets.all {

    namespace = 'foundation.e.apps'

    kotlin.sourceSets.configureEach {

        languageSettings.optIn("kotlin.RequiresOptIn")

    }

}
@@ -182,27 +183,27 @@ dependencies { 


    implementation 'foundation.e.lib:telemetry:0.0.11-alpha'

    implementation 'foundation.e:gplayapi:3.4.2-0'

    implementation 'androidx.core:core-ktx:1.9.0'

    implementation 'androidx.appcompat:appcompat:1.6.1'

    implementation 'androidx.fragment:fragment-ktx:1.5.6'

    implementation 'com.google.android.material:material:1.5.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'

    implementation 'androidx.core:core-ktx:1.15.0'

    implementation 'androidx.appcompat:appcompat:1.7.0'

    implementation 'androidx.fragment:fragment-ktx:1.8.5'

    implementation 'com.google.android.material:material:1.12.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'

    implementation 'androidx.legacy:legacy-support-v4:1.0.0'

    implementation 'androidx.preference:preference-ktx:1.2.0'

    implementation "androidx.datastore:datastore-preferences:1.0.0"

    implementation 'androidx.preference:preference-ktx:1.2.1'

    implementation "androidx.datastore:datastore-preferences:1.1.1"

    implementation 'com.facebook.shimmer:shimmer:0.5.0'

    implementation 'androidx.core:core-google-shortcuts:1.0.0'

    implementation 'androidx.core:core-google-shortcuts:1.1.0'

    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

    testImplementation "com.google.truth:truth:1.1.3"

    testImplementation "com.google.truth:truth:1.1.4"

    testImplementation 'junit:junit:4.13.2'

    androidTestImplementation 'androidx.test.ext:junit:1.1.5'

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

    androidTestImplementation 'androidx.test.ext:junit:1.2.1'

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

    // Optional -- Robolectric environment

    testImplementation "androidx.test:core:1.5.0"

    testImplementation "androidx.test:core:1.6.1"

    // Optional -- Mockito framework

    testImplementation "org.mockito:mockito-core:5.0.0"

    testImplementation "org.mockito:mockito-core:5.14.2"

    // Optional -- mockito-kotlin

    testImplementation "org.mockito.kotlin:mockito-kotlin:4.1.0"

    testImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0"

    testImplementation 'org.mockito:mockito-inline:5.0.0'

    testImplementation "androidx.arch.core:core-testing:2.2.0"
@@ -213,12 +214,12 @@ dependencies { 
    implementation 'com.github.Baseflow:PhotoView:2.3.0'



    //Protobuf and Gson

    implementation 'com.google.code.gson:gson:2.9.0'

    implementation "com.google.protobuf:protobuf-javalite:3.25.2"

    implementation 'com.google.code.gson:gson:2.11.0'

    implementation "com.google.protobuf:protobuf-javalite:4.28.2"



    // ViewPager2 and RecyclerView

    implementation "androidx.viewpager2:viewpager2:1.0.0"

    implementation "androidx.recyclerview:recyclerview:1.2.1"

    implementation "androidx.viewpager2:viewpager2:1.1.0"

    implementation "androidx.recyclerview:recyclerview:1.3.2"



    //logger

    implementation 'com.jakewharton.timber:timber:5.0.1'
@@ -227,43 +228,42 @@ dependencies { 
    implementation 'org.bouncycastle:bcpg-jdk15on:1.60'



    // Retrofit

    def retrofit_version = "2.9.0"

    def retrofit_version = "2.11.0"

    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"

    implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"

    implementation "com.squareup.retrofit2:converter-jackson:$retrofit_version"

    implementation "com.squareup.moshi:moshi-kotlin:1.13.0"

//    implementation "com.squareup.moshi:moshi-adapters:1.5.0"

    implementation "com.squareup.okhttp3:okhttp:4.9.2"

    implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"

    implementation "com.squareup.moshi:moshi-kotlin:1.15.1"

    implementation "com.squareup.okhttp3:okhttp:4.12.0"

    implementation "com.squareup.okhttp3:logging-interceptor:4.11.0"



    // JSON Converter

    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'

    implementation 'com.squareup.retrofit2:converter-gson:2.11.0'



    // YAML factory

    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2"

    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.0"



    // Navigation Components

    def navigation_version = "2.6.0"

    def navigation_version = "2.8.5"

    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"

    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"



    // Hilt

    def hilt_version = '2.51.1'

    def hilt_version = '2.54'

    kapt "com.google.dagger:hilt-compiler:$hilt_version"

    implementation "com.google.dagger:hilt-android:$hilt_version"

    implementation 'androidx.hilt:hilt-work:1.0.0'

    kapt 'androidx.hilt:hilt-compiler:1.0.0'

    implementation 'androidx.hilt:hilt-work:1.2.0'

    kapt 'androidx.hilt:hilt-compiler:1.2.0'



    // Lifecycle Components

    def lifecycle_version = "2.6.1"

    def lifecycle_version = "2.8.7"

    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"

    implementation "android.arch.lifecycle:extensions:1.1.1"

    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"



    // Coroutines

    def coroutines_version = "1.6.0"

    def test_kotlin_version = "1.6.0"

    def coroutines_version = "1.9.0"

    def test_kotlin_version = "2.1.0"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"

    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
@@ -275,15 +275,15 @@ dependencies { 
    implementation "androidx.room:room-runtime:2.6.1"



    // WorkManager

    implementation 'androidx.work:work-runtime-ktx:2.7.1'

    implementation 'androidx.work:work-runtime-ktx:2.10.0'



    // JSoup

    implementation 'org.jsoup:jsoup:1.13.1'

    implementation 'org.jsoup:jsoup:1.17.2'



    // elib

    implementation 'foundation.e:elib:0.0.1-alpha11'



    // androidx.activity

    def activity_version = "1.6.1"

    def activity_version = "1.9.3"

    implementation("androidx.activity:activity-ktx:$activity_version")

}

app/src/main/java/foundation/e/apps/AppLoungeApplication.kt

+2 −2
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ class AppLoungeApplication : Application(), Configuration.Provider { 
        )

    }



    override fun getWorkManagerConfiguration() =

        Configuration.Builder()

    override val workManagerConfiguration: Configuration

        get() = Configuration.Builder()

            .setWorkerFactory(workerFactory)

            .setExecutor(Executors.newSingleThreadExecutor())

            .build()

app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt

+3 −12
Original line number Diff line number Diff line
@@ -139,12 +139,8 @@ class AppLoungePackageManager @Inject constructor( 


    fun getInstallerName(packageName: String): String {

        return try {

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {

            val installerInfo = packageManager.getInstallSourceInfo(packageName)

            installerInfo.originatingPackageName ?: installerInfo.installingPackageName ?: UNKNOWN_VALUE

            } else {

                packageManager.getInstallerPackageName(packageName) ?: UNKNOWN_VALUE

            }

        } catch (e: NameNotFoundException) {

            Timber.e("getInstallerName -> $packageName : ${e.localizedMessage}")

            UNKNOWN_VALUE
@@ -164,12 +160,7 @@ class AppLoungePackageManager @Inject constructor( 


    fun getVersionCode(packageName: String): String {

        val packageInfo = getPackageInfo(packageName)

        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {

            packageInfo?.longVersionCode?.toString() ?: UNKNOWN_VALUE

        } else {

            @Suppress("DEPRECATION")

            packageInfo?.versionCode?.toString() ?: UNKNOWN_VALUE

        }

        return packageInfo?.longVersionCode?.toString() ?: UNKNOWN_VALUE

    }



    fun getVersionName(packageName: String): String {

app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ class SplitInstallBinder( 
        if (ignoreList != null && packageName in ignoreList) return



        val appInfo = context.packageManager.getPackageInfo(packageName, 0).applicationInfo

            ?: return

        val appLabel = context.packageManager.getApplicationLabel(appInfo)

        val callerUid = appInfo.uid

        val contentText = context.getString(

app/src/main/java/foundation/e/apps/ui/MainActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ class MainActivity : AppCompatActivity() { 
        checkGPlayLoginRequest(intent)

    }



    override fun onNewIntent(intent: Intent?) {

    override fun onNewIntent(intent: Intent) {

        super.onNewIntent(intent)

        checkGPlayLoginRequest(intent)

        findNavController(R.id.fragment).handleDeepLink(intent)