chore: Update gradle dependencies (176e0acc) · Commits · e / os / eDrive

.gitlab-ci.yml

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ stages:
		- gitlab_release

		before_script:
		- export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
		- export GRADLE_USER_HOME=$(pwd)/.gradle
		- chmod +x ./gradlew

		@@ -47,7 +48,7 @@ build:
		fi
		cd "release"
		- unsigned_build=$(ls *.apk \| grep "unsigned")
		- cp $unsigned_build $UNSIGNED_APK
		- mv $unsigned_build $UNSIGNED_APK
		artifacts:
		paths:
		- app/build/outputs/apk/

app/build.gradle

+46 −42

Original line number	Diff line number	Diff line
		@@ -35,15 +35,16 @@ def getSentryDsn = { ->
		}

		android {
		compileSdk 34
		namespace = 'foundation.e.drive'
		compileSdk = 36

		defaultConfig {
		applicationId "foundation.e.drive"
		minSdk 26
		targetSdk 34
		versionCode versionMajor * 1000000 + versionMinor * 1000 + versionPatch
		versionName "${versionMajor}.${versionMinor}.${versionPatch}"
		setProperty("archivesBaseName", "eDrive-$versionName")
		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
		applicationId = "foundation.e.drive"
		minSdk = 26
		targetSdk = 36
		versionCode = versionMajor * 1000000 + versionMinor * 1000 + versionPatch
		versionName = "${versionMajor}.${versionMinor}.${versionPatch}"
		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

		manifestPlaceholders = [
		'appAuthRedirectScheme': applicationId,
		@@ -52,30 +53,26 @@ android {

		signingConfigs {
		debugConfig {
		storeFile file("../keystore/platform.keystore")
		storePassword 'android'
		keyAlias 'platform'
		keyPassword 'android'
		storeFile = file("../keystore/platform.keystore")
		storePassword = 'android'
		keyAlias = 'platform'
		keyPassword = 'android'
		}
		}

		buildTypes {
		release {
		minifyEnabled false
		proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
		minifyEnabled = false
		proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
		buildConfigField("String", "SENTRY_DSN", "\"${getSentryDsn()}\"")
		}

		debug {
		signingConfig signingConfigs.debugConfig
		signingConfig = signingConfigs.debugConfig
		buildConfigField("String", "SENTRY_DSN", "\"dummy\"")
		}
		}

		kotlinOptions {
		jvmTarget = "11"
		}

		testOptions {
		unitTests {
		returnDefaultValues = true
		@@ -87,12 +84,19 @@ android {
		}
		}
		}

		buildFeatures {
		viewBinding true
		buildConfig = true
		viewBinding = true
		}

		compileOptions {
		sourceCompatibility JavaVersion.VERSION_11
		targetCompatibility JavaVersion.VERSION_11
		sourceCompatibility = JavaVersion.VERSION_21
		targetCompatibility = JavaVersion.VERSION_21
		}

		kotlinOptions {
		jvmTarget = "21"
		}
		}

		@@ -105,32 +109,32 @@ dependencies {

		implementation "commons-httpclient:commons-httpclient:3.1@jar"
		implementation fileTree(include: ['*.jar'], dir: 'libs')
		api 'androidx.annotation:annotation:1.7.0'
		implementation 'androidx.appcompat:appcompat:1.6.1'
		implementation "androidx.constraintlayout:constraintlayout:2.1.4"
		implementation 'com.google.android.material:material:1.10.0'
		implementation 'com.github.bumptech.glide:glide:4.15.1'
		implementation 'com.github.bumptech.glide:annotations:4.15.1'
		implementation 'androidx.core:core-ktx:1.12.0'
		annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
		implementation "androidx.work:work-runtime:2.9.0"
		implementation 'androidx.test:core:1.5.0'
		api 'androidx.annotation:annotation:1.9.1'
		implementation 'androidx.appcompat:appcompat:1.7.1'
		implementation "androidx.constraintlayout:constraintlayout:2.2.1"
		implementation 'com.google.android.material:material:1.13.0'
		implementation 'com.github.bumptech.glide:glide:5.0.5'
		implementation 'com.github.bumptech.glide:annotations:5.0.5'
		implementation 'androidx.core:core-ktx:1.17.0'
		annotationProcessor 'com.github.bumptech.glide:compiler:5.0.5'
		implementation "androidx.work:work-runtime:2.11.0"
		implementation 'androidx.test:core:1.7.0'
		implementation 'com.jakewharton.timber:timber:5.0.1'
		implementation 'foundation.e:elib:0.0.1-alpha11'
		implementation 'foundation.e.lib:telemetry:1.0.1-release'


		androidTestImplementation 'androidx.test:runner:1.5.2'
		androidTestImplementation 'androidx.test:rules:1.5.0'
		androidTestImplementation 'androidx.annotation:annotation:1.7.0'
		androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
		androidTestImplementation 'androidx.test:runner:1.7.0'
		androidTestImplementation 'androidx.test:rules:1.7.0'
		androidTestImplementation 'androidx.annotation:annotation:1.9.1'
		androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
		androidTestImplementation 'junit:junit:4.13.2'

		testImplementation 'androidx.test:runner:1.5.2'
		testImplementation 'androidx.test:rules:1.5.0'
		testImplementation 'androidx.test:runner:1.7.0'
		testImplementation 'androidx.test:rules:1.7.0'

		testImplementation 'junit:junit:4.13.2'
		testImplementation 'org.robolectric:robolectric:4.7.3'
		testImplementation 'org.mockito:mockito-core:5.0.0'
		testImplementation 'androidx.work:work-testing:2.9.0'
		testImplementation 'org.robolectric:robolectric:4.16'
		testImplementation 'org.mockito:mockito-core:5.20.0'
		testImplementation 'androidx.work:work-testing:2.11.0'
		}

app/src/main/AndroidManifest.xml

+1 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		package="foundation.e.drive">
		xmlns:tools="http://schemas.android.com/tools">

		<uses-permission android:name="android.permission.INTERNET" />
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

build.gradle

+6 −6

Original line number	Diff line number	Diff line
		// Top-level build file where you can add configuration options common to all sub-projects/modules.
		plugins {
		id 'com.android.application' version '7.1.3' apply false
		id 'com.android.library' version '7.1.3' apply false
		id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
		id 'io.gitlab.arturbosch.detekt' version '1.23.1'
		id 'com.android.application' version '8.13.0' apply false
		id 'com.android.library' version '8.13.0' apply false
		id 'org.jetbrains.kotlin.android' version '2.2.21' apply false
		id 'io.gitlab.arturbosch.detekt' version '1.23.8'
		}

		task clean(type: Delete) {
		tasks.register('clean', Delete) {
		delete rootProject.buildDir
		}

		subprojects {
		detekt {
		toolVersion = "1.23.1"
		toolVersion = "1.23.8"

		source = files(
		"src/main/java"

gradle.properties

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,3 +16,5 @@ org.gradle.jvmargs=-Xmx1536m
		# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
		# org.gradle.parallel=true
		android.useAndroidX=true
		android.nonTransitiveRClass=false
		android.nonFinalResIds=false
		No newline at end of file