diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 47dc04d4..1cd66444 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -76,7 +76,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - gradle: [ 6.8.3, current, rc ] + gradle: [ 7.0.2, current, rc ] task: [ build, projectTest, projectLint, projectCodeStyle, projectCoverage, issueLinksReport ] name: (Android) Gradle version ${{ matrix.gradle }}, task ${{ matrix.task }} steps: diff --git a/Changelog.md b/Changelog.md index 3096842d..344d0a2e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.31.0] - 2021-07-28 +## Changed +- Update _Android Gradle Plugin_ to _7.0.0_, see [release notes](https://developer.android.com/studio/releases/gradle-plugin) + +## [0.30.0] - 2021-07-28 +## Changed +- Update Kotlin plugin to _1.5.21_, see [release notes](https://github.com/JetBrains/kotlin/releases/tag/v1.5.21) ## [0.29.0] - 2021-07-10 ## Changed diff --git a/android/build.gradle b/android/build.gradle index 676f61a9..d68a636d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,7 +12,7 @@ repositories { } dependencies { - api 'com.android.tools.build:gradle:4.2.2' + api 'com.android.tools.build:gradle:7.0.0' implementation project(":jvm") implementation project(":config") implementation project(":versioning") diff --git a/android/src/main/kotlin/com/project/starter/modules/internal/AndroidPluginUtils.kt b/android/src/main/kotlin/com/project/starter/modules/internal/AndroidPluginUtils.kt index 4da7d321..066fab72 100644 --- a/android/src/main/kotlin/com/project/starter/modules/internal/AndroidPluginUtils.kt +++ b/android/src/main/kotlin/com/project/starter/modules/internal/AndroidPluginUtils.kt @@ -18,8 +18,8 @@ import org.gradle.api.Project internal fun BaseExtension.configureAndroidPlugin(rootConfig: RootConfigExtension) { defaultConfig.apply { compileSdkVersion(rootConfig.android.compileSdkVersion) - minSdkVersion(rootConfig.android.minSdkVersion) - targetSdkVersion(rootConfig.android.targetSdkVersion ?: rootConfig.android.compileSdkVersion) + minSdk = rootConfig.android.minSdkVersion + targetSdk = rootConfig.android.targetSdkVersion ?: rootConfig.android.compileSdkVersion setTestInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner") } diff --git a/build.gradle b/build.gradle index c9957d9d..527649a7 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ allprojects { pluginManager.withPlugin("java") { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index e35c2c6b..70849f40 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -11,7 +11,7 @@ repositories { dependencies { implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin' implementation "com.gradle.publish:plugin-publish-plugin:0.15.0" - implementation "com.project.starter:jvm:0.28.2" + implementation "com.project.starter:jvm:0.30.0" } gradlePlugin { diff --git a/buildSrc/src/main/groovy/myproject.java-conventions.gradle b/buildSrc/src/main/groovy/myproject.java-conventions.gradle index 5dd38970..682ebd9f 100644 --- a/buildSrc/src/main/groovy/myproject.java-conventions.gradle +++ b/buildSrc/src/main/groovy/myproject.java-conventions.gradle @@ -1,5 +1,5 @@ java { toolchain { - languageVersion = JavaLanguageVersion.of(8) + languageVersion = JavaLanguageVersion.of(11) } } diff --git a/config/src/main/kotlin/com/project/starter/config/extensions/RootConfigExtension.kt b/config/src/main/kotlin/com/project/starter/config/extensions/RootConfigExtension.kt index f1357533..9843c41b 100644 --- a/config/src/main/kotlin/com/project/starter/config/extensions/RootConfigExtension.kt +++ b/config/src/main/kotlin/com/project/starter/config/extensions/RootConfigExtension.kt @@ -1,9 +1,7 @@ package com.project.starter.config.extensions -import groovy.lang.Closure import org.gradle.api.Action import org.gradle.api.JavaVersion -import org.gradle.util.ConfigureUtil open class RootConfigExtension( var javaVersion: JavaVersion = JavaVersion.VERSION_1_8, @@ -14,21 +12,12 @@ open class RootConfigExtension( val android = AndroidPluginConfig() val versioning = VersioningPluginConfig() - fun qualityPlugin(c: Closure) = - ConfigureUtil.configure(c, quality) - fun qualityPlugin(action: Action) = action.execute(quality) - fun androidPlugin(c: Closure) = - ConfigureUtil.configure(c, android) - fun androidPlugin(action: Action) = action.execute(android) - fun versioningPlugin(c: Closure) = - ConfigureUtil.configure(c, versioning) - fun versioningPlugin(action: Action) = action.execute(versioning) diff --git a/quality/build.gradle b/quality/build.gradle index dd764c21..7692ac57 100644 --- a/quality/build.gradle +++ b/quality/build.gradle @@ -13,7 +13,7 @@ dependencies { api 'org.jmailen.gradle:kotlinter-gradle:3.4.5' api 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.17.1' api 'org.jetbrains.kotlin:kotlin-gradle-plugin' - compileOnly 'com.android.tools.build:gradle:4.2.2' + compileOnly 'com.android.tools.build:gradle:7.0.0' implementation 'com.github.usefulness:issuechecker:0.3.0' implementation project(":config") diff --git a/quality/src/main/kotlin/com/project/starter/quality/internal/Detekt.kt b/quality/src/main/kotlin/com/project/starter/quality/internal/Detekt.kt index bb88f3a3..8922d3e0 100644 --- a/quality/src/main/kotlin/com/project/starter/quality/internal/Detekt.kt +++ b/quality/src/main/kotlin/com/project/starter/quality/internal/Detekt.kt @@ -21,7 +21,6 @@ internal fun Project.configureDetekt() { onMultiplatform { sourceSets.configureEach { detekt.input.from(it.kotlin.srcDirs) - // detekt.input.from(it.kotlin.srcDirTrees) } } diff --git a/versioning/build.gradle b/versioning/build.gradle index 3b1fdacb..2bd631f9 100644 --- a/versioning/build.gradle +++ b/versioning/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - compileOnly 'com.android.tools.build:gradle:4.2.2' + compileOnly 'com.android.tools.build:gradle:7.0.0' implementation 'pl.allegro.tech.build:axion-release-plugin:1.13.3' implementation project(":config")