From c59fcdbd0559bc36d7bfe8c669674b30142bc61f Mon Sep 17 00:00:00 2001 From: M M Arif Date: Sun, 16 Jul 2023 14:07:56 +0500 Subject: [PATCH] Update project gradle and jdk, bump version to the new upcoming version --- app/build.gradle | 28 ++++++++++++------------ build.gradle | 2 +- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f3dbde41..886e6e3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,13 +4,13 @@ plugins { apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "org.mian.gitnex" minSdkVersion 23 - targetSdkVersion 33 - versionCode 510 - versionName "5.1.0" + targetSdkVersion 34 + versionCode 515 + versionName "5.2.0-dev" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -37,7 +37,7 @@ android { coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_17 } lint { abortOnError false @@ -54,17 +54,17 @@ configurations { } dependencies { - def lifecycle_version = '2.6.0' + def lifecycle_version = '2.6.1' def markwon_version = '4.6.2' def work_version = '2.8.1' def acra = '5.9.7' implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0-beta01' - implementation 'androidx.compose.material3:material3:1.1.0-beta01' - implementation 'androidx.compose.material3:material3-window-size-class:1.1.0-beta01' - implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' + implementation 'com.google.android.material:material:1.11.0-alpha01' + implementation 'androidx.compose.material3:material3:1.2.0-alpha03' + implementation 'androidx.compose.material3:material3-window-size-class:1.2.0-alpha03' + implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.legacy:legacy-support-v4:1.0.0" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" @@ -79,7 +79,7 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.squareup.retrofit2:converter-scalars:2.9.0' implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2' - implementation 'org.ocpsoft.prettytime:prettytime:5.0.6.Final' + implementation 'org.ocpsoft.prettytime:prettytime:5.0.7.Final' implementation 'com.github.Pes8:android-material-color-picker-dialog:master' implementation "io.noties.markwon:core:$markwon_version" implementation "io.noties.markwon:ext-latex:$markwon_version" @@ -103,8 +103,8 @@ dependencies { implementation "ch.acra:acra-mail:$acra" implementation "ch.acra:acra-limiter:$acra" implementation "ch.acra:acra-notification:$acra" - implementation 'androidx.room:room-runtime:2.5.1' - annotationProcessor 'androidx.room:room-compiler:2.5.1' + implementation 'androidx.room:room-runtime:2.5.2' + annotationProcessor 'androidx.room:room-compiler:2.5.2' implementation "androidx.work:work-runtime:$work_version" implementation "io.mikael:urlbuilder:2.0.9" implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2" @@ -116,7 +116,7 @@ dependencies { implementation('org.codeberg.gitnex:tea4j-autodeploy:3111bc1b18') { exclude module: 'org.apache.oltu.oauth2.common' } - implementation 'io.github.amrdeveloper:codeview:1.3.7' + implementation 'io.github.amrdeveloper:codeview:1.3.8' constraints { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") diff --git a/build.gradle b/build.gradle index 9c232347..a92da85f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:8.0.2' } } diff --git a/gradle.properties b/gradle.properties index a43d4a12..1547a776 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,12 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.workers.max=12 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a3aaf6e2..8ba31e99 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 10 19:24:36 CET 2021 +#Tue Jul 11 23:34:25 PKT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip