diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1282456..433e559 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7b571e2..6e9f0ac 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -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 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index feab233..e6a305c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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" diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index a401541..697f22a 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -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}" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee8da55..eb95ab8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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