Migrate to AGP 7

This commit is contained in:
Rafael Caetano 2021-08-14 01:35:56 +01:00
parent 0ce2110223
commit 446c1c60d9
5 changed files with 10 additions and 10 deletions

View File

@ -28,7 +28,7 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: '8'
java-version: '11'
- name: Setup Android SDK
uses: android-actions/setup-android@v2

View File

@ -17,7 +17,7 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: '8'
java-version: '11'
- name: Setup Android SDK
uses: android-actions/setup-android@v2
@ -74,7 +74,7 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: '8'
java-version: '11'
- name: Setup Android SDK
uses: android-actions/setup-android@v2

View File

@ -19,12 +19,12 @@ android {
}
}
compileSdkVersion(AppConfig.compileSdkVersion)
compileSdk = AppConfig.compileSdkVersion
ndkVersion = AppConfig.ndkVersion
defaultConfig {
applicationId = "me.magnum.melonds"
minSdkVersion(AppConfig.minSdkVersion)
targetSdkVersion(AppConfig.targetSdkVersion)
minSdk = AppConfig.minSdkVersion
targetSdk = AppConfig.targetSdkVersion
versionCode = AppConfig.versionCode
versionName = AppConfig.versionName
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@ -53,7 +53,7 @@ android {
}
}
flavorDimensions("version")
flavorDimensions.add("version")
productFlavors {
create("playStore") {
dimension = "version"

View File

@ -2,7 +2,7 @@ object Dependencies {
private object Versions {
const val Kotlin = "1.5.10"
const val HiltX = "1.0.0"
const val Hilt = "2.35.1"
const val Hilt = "2.37"
const val Room = "2.3.0"
const val Work = "2.5.0"
const val Markwon = "4.6.2"
@ -10,7 +10,7 @@ object Dependencies {
}
object GradlePlugins {
const val gradle = "com.android.tools.build:gradle:4.2.2"
const val gradle = "com.android.tools.build:gradle:7.0.0"
const val hiltAndroid = "com.google.dagger:hilt-android-gradle-plugin:${Versions.Hilt}"
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Kotlin}"
}

View File

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