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

Commit e24ae4eb authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Upgrade gradle deps

parent 598e5371

app/build.gradle.kts

+7 −5
Original line number Diff line number Diff line 
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

import java.text.SimpleDateFormat

import java.util.Date

import java.util.Locale
@@ -5,7 +6,6 @@ import java.util.Properties 


plugins {

    alias(libs.plugins.android.application)

    alias(libs.plugins.kotlin.android)

    alias(libs.plugins.ksp)

    alias(libs.plugins.ktlint)

    alias(libs.plugins.kotlin.serialization)
@@ -43,13 +43,13 @@ fun getSentryDsn(): String? { 


android {

    compileSdk = 36

    compileSdkMinor = 1

    namespace = "foundation.e.apps"



    defaultConfig {

        applicationId = "foundation.e.apps"

        minSdk = 30

        //noinspection OldTargetApi

        targetSdk = 34

        targetSdk = 36

        versionCode = versionMajor * 1000000 + versionMinor * 1000 + versionPatch

        versionName = "${versionMajor}.${versionMinor}.${versionPatch}"
@@ -171,8 +171,10 @@ android { 
        targetCompatibility = JavaVersion.VERSION_21

    }



    kotlinOptions {

        jvmTarget = "21"

    kotlin {

        compilerOptions {

            jvmTarget = JvmTarget.JVM_21

        }

    }



    lint {

app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { 
    private suspend fun loadContentRatingDrawable(url: String): Drawable? {

        return withContext(Dispatchers.IO) {

            val imageRequest = ImageRequest.Builder(requireContext()).data(url).build()

            val result = ImageLoader.invoke(requireContext()).execute(imageRequest)

            val result = ImageLoader.Builder(requireContext()).build().execute(imageRequest)

            if (result is SuccessResult) result.drawable else null

        }

    }

app/src/main/java/foundation/e/apps/ui/search/SearchViewHandler.kt

+4 −4
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ class SearchViewHandler( 


    internal fun populateSuggestionsAdapter(suggestions: List<SearchSuggestion>?) {

        val cursor = MatrixCursor(arrayOf(BaseColumns._ID, SUGGESTION_KEY))

        suggestions?.let {

            for (i in it.indices) {

                cursor.addRow(arrayOf(i, it[i].suggestion))

            }

        suggestions?.forEachIndexed { index, suggestion ->

            cursor.newRow()

                .add(index)

                .add(suggestion.suggestion)

        }

        searchView.suggestionsAdapter?.changeCursor(cursor)

    }

app/src/test/java/foundation/e/apps/util/FakeCall.kt

+17 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import okhttp3.Request 
import okhttp3.Response

import okhttp3.ResponseBody.Companion.toResponseBody

import okio.Timeout

import kotlin.reflect.KClass



class FakeCall : Call {
@@ -80,4 +81,20 @@ class FakeCall : Call { 
    override fun timeout(): Timeout {

        TODO("Not yet implemented")

    }



    override fun <T : Any> tag(type: KClass<T>): T? {

        TODO("Not yet implemented")

    }



    override fun <T> tag(type: Class<out T>): T? {

        TODO("Not yet implemented")

    }



    override fun <T : Any> tag(type: KClass<T>, computeIfAbsent: () -> T): T {

        TODO("Not yet implemented")

    }



    override fun <T : Any> tag(type: Class<T>, computeIfAbsent: () -> T): T {

        TODO("Not yet implemented")

    }

}

build.gradle.kts

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ import org.gradle.testing.jacoco.tasks.JacocoReport 
plugins {

    alias(libs.plugins.android.application) apply false

    alias(libs.plugins.android.library) apply false

    alias(libs.plugins.kotlin.android) apply false

    alias(libs.plugins.kotlin.plugin.allopen) apply false

    alias(libs.plugins.kotlin.jvm) apply false

    alias(libs.plugins.kotlin.serialization) apply false
@@ -30,9 +29,10 @@ allprojects { 
}



subprojects {

    val jacocoVersion = "0.8.14"

    plugins.withId("jacoco") {

        extensions.configure<JacocoPluginExtension> {

            toolVersion = libs.versions.jacoco.get()

            toolVersion = jacocoVersion

        }

        tasks.withType<Test>().configureEach {

            extensions.findByType(JacocoTaskExtension::class.java)?.apply {
@@ -72,7 +72,7 @@ subprojects { 
                    ?: configurations.create("jacocoAnt")

                if (jacocoAnt.dependencies.isEmpty()) {

                    jacocoAnt.dependencies.add(

                        dependencies.create("org.jacoco:org.jacoco.ant:${libs.versions.jacoco.get()}")

                        dependencies.create("org.jacoco:org.jacoco.ant:$jacocoVersion")

                    )

                }