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

Commit 45ffa63a authored by Gitsaibot's avatar Gitsaibot Committed by Gitsaibot
Browse files

Update dependencies

parent 955babce

app/build.gradle.kts

+4 −11
Original line number Diff line number Diff line 
import org.jetbrains.kotlin.gradle.dsl.JvmTarget



plugins {

    alias(libs.plugins.android.application)

    alias(libs.plugins.jetbrains.kotlin.android)

    alias(libs.plugins.ec4j.editorconfig)

}



editorconfig {

	excludes = listOf("metadata/**", "**/*.webp")

	excludes = listOf("metadata/**", "**/*.xml", "**/*.webp")

}



kotlin {
@@ -21,7 +18,7 @@ android { 


	defaultConfig {

		minSdk = 23

		targetSdk = 35

		targetSdk = 36

		versionCode = 52

		versionName = "1.0.52"

		applicationId = "ws.xsoh.etar"
@@ -54,6 +51,7 @@ android { 
	buildFeatures {

        buildConfig = true

		viewBinding = true

		resValues = true

	}



	/*
@@ -104,12 +102,6 @@ android { 
		targetCompatibility(JavaVersion.VERSION_21)

	}



kotlin {

    compilerOptions {

         jvmTarget = JvmTarget.JVM_21

    }

}



	useLibrary("android.test.base")

	useLibrary("android.test.mock")
@@ -130,6 +122,7 @@ dependencies { 
    implementation(libs.androidx.work.runtime)

    implementation(libs.androidx.concurrent.futures)

    testImplementation(libs.junit)

	testImplementation(libs.androidx.test.runner)



	coreLibraryDesugaring(libs.android.tools.desugar)

build.gradle.kts

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
plugins {

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

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

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

    alias(libs.plugins.ec4j.editorconfig) apply false

    alias(libs.plugins.jetbrains.idea.ext) apply true

}

gradle/libs.versions.toml

+5 −5
Original line number Diff line number Diff line 
[versions]

agp = "8.13.2"

agp = "9.1.0"

compat = "1.7.1"

constraint = "2.2.1"

core = "1.17.0"

core = "1.18.0"

desugar = "2.1.5"

junit = "4.13.2"

kotlin = "2.3.0"

editorconfig = "0.1.0"

ideaExt = "1.3"

ideaExt = "1.4.1"

coroutines = "1.10.2"

libRecur = "0.17.1"

lifecycle = "2.10.0"
@@ -15,6 +14,7 @@ material = "1.13.0" 
preference = "1.2.1"

workRuntime = "2.11.1"

androidxConcurrent = "1.3.0"

androidxTest = "1.7.0"



[libraries]

androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "compat" }
@@ -29,10 +29,10 @@ dmfs-lib-recur = { module = "org.dmfs:lib-recur", version.ref = "libRecur" } 
google-android-material = { module = "com.google.android.material:material", version.ref = "material" }

androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "workRuntime" }

androidx-concurrent-futures = { module = "androidx.concurrent:concurrent-futures", version.ref = "androidxConcurrent" }

androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxTest" }



[plugins]

android-application = { id = "com.android.application", version.ref = "agp" }

android-library = { id = "com.android.library", version.ref = "agp" }

jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

jetbrains-idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "ideaExt" }

ec4j-editorconfig = { id = "org.ec4j.editorconfig", version.ref = "editorconfig" }

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f

distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip

distributionSha256Sum=60ea723356d81263e8002fec0fcf9e2b0eee0c0850c7a3d7ab0a63f2ccc601f3

distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME