Update dependencies (#423)
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
## What changes were proposed in this pull request? Update dependencies. ## How was this patch tested? Manually. Reviewed-on: #423 Co-authored-by: Amab <juanmi1982@gmail.com> Co-committed-by: Amab <juanmi1982@gmail.com>
This commit is contained in:
parent
18b254da46
commit
caad081edb
|
@ -1,5 +1,7 @@
|
|||
import io.github.reactivecircus.appversioning.SemVer
|
||||
|
||||
plugins {
|
||||
id 'com.gladed.androidgitversion' version '0.4.14'
|
||||
id("io.github.reactivecircus.app-versioning") version "1.3.1"
|
||||
}
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
|
@ -37,10 +39,20 @@ if (build_param != "prod") {
|
|||
}
|
||||
}
|
||||
|
||||
appVersioning {
|
||||
overrideVersionCode { gitTag, providers, variantInfo ->
|
||||
//SemVer-based version code
|
||||
def semVer = SemVer.fromGitTag(gitTag)
|
||||
semVer.major * 1000000 + semVer.minor * 1000 + semVer.patch
|
||||
|
||||
//Timestamp-based version code
|
||||
//Instant.now().epochSecond.toInt()
|
||||
}
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'es.ugr.swad.swadroid'
|
||||
compileSdk 34
|
||||
buildToolsVersion "34.0.0"
|
||||
|
||||
lint {
|
||||
abortOnError false
|
||||
|
@ -53,8 +65,6 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
applicationId "es.ugr.swad.swadroid"
|
||||
versionName androidGitVersion.name()
|
||||
versionCode androidGitVersion.code()
|
||||
|
||||
minSdkVersion 24
|
||||
targetSdkVersion 34
|
||||
|
@ -82,5 +92,5 @@ dependencies {
|
|||
implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
|
||||
implementation 'com.google.zxing:core:3.5.2'
|
||||
implementation 'com.google.code.gson:gson:2.10.1'
|
||||
implementation 'com.google.android.material:material:1.9.0'
|
||||
implementation 'com.google.android.material:material:1.10.0'
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@ buildscript {
|
|||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.1.0'
|
||||
classpath 'com.android.tools.build:gradle:8.1.2'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ android.nonFinalResIds=false
|
|||
android.nonTransitiveRClass=false
|
||||
android.useAndroidX=true
|
||||
org.gradle.jvmargs=-Xmx2560M
|
||||
org.gradle.unsafe.configuration-cache=true
|
||||
org.gradle.caching=true
|
||||
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
Loading…
Reference in New Issue
Block a user