upd gradle versions

This commit is contained in:
Yuriy Liskov 2022-08-30 08:09:02 +03:00
parent 6ff563fec1
commit c310f59c94
6 changed files with 13 additions and 7 deletions

@ -1 +1 @@
Subproject commit 3bc1857e1d40e5f71fe428835e38096568340af6
Subproject commit 86d7b6e9f73b77d0b29325ca9b9abd39e61784f0

@ -1 +1 @@
Subproject commit 9c22818cfa4f68c368669e5d1d7946f0d5599b25
Subproject commit 3203cd507e6d6598336a2df3a9f3cfadbbb19a09

View File

@ -1,6 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
apply from: gradle.ext.sharedModulesConstants
// NOT working
// Running 'gradle wrapper' will generate gradlew
wrapper {
gradleVersion = gradleVersion
distributionType = Wrapper.DistributionType.BIN
}
buildscript {
apply from: gradle.ext.sharedModulesConstants
@ -10,7 +17,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.4'
classpath 'com.android.tools.build:gradle:' + androidGradleVersion
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + kotlinVersion
// NOTE: Do not place your application dependencies here; they belong

View File

@ -48,7 +48,7 @@ dependencies {
implementation project(':sharedutils')
implementation 'androidx.appcompat:appcompat:' + appCompatXLibraryVersion
implementation 'com.google.android.material:material:1.2.1'
implementation "com.google.android:flexbox:1.0.0"
implementation 'com.google.android.material:material:' + materialVersion
implementation "com.google.android:flexbox:" + flexboxVersion
implementation 'androidx.recyclerview:recyclerview:' + recyclerviewXLibraryVersion
}

View File

@ -3,5 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
#distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip

View File

@ -138,7 +138,7 @@ android {
variant.outputs.each { output ->
def project = "STubeNext"
def flavor = variant.productFlavors[-1].name
def buildType = variant.variantData.variantConfiguration.buildType.name.take(1)
def buildType = variant.buildType.name.take(1)
def version = variant.versionName
def newApkName = sprintf("%s_%s_v%s_%s.apk", [project, flavor, version, buildType])