letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Update Gradle to 8.1 and AGP to v8.0 (#329)

Browse Source 
* Update AGP to 8.0.0.

* Set JAVA_HOME to JDK17

* Update lint version.

* Use right JDK for dependency analysis, replace deprecated env var.

* Upgrade to Gradle 8.1.

* Remove `@Supress(DSL_SCOPE_VIOLATION)` as it's no longer needed.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
Jorge Martin Espinosa
2023-04-17 10:49:52 +02:00
committed by GitHub
parent 3a84bc3b58
commit afd58f1634
89 changed files with 99 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/build.gradle.kts
View File

@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
plugins {
`kotlin-dsl`
`kotlin-dsl-precompiled-script-plugins`

2
plugins/src/main/kotlin/Versions.kt
View File

@@ -24,6 +24,6 @@ object Versions {
const val compileSdk = 33
const val targetSdk = 33
const val minSdk = 23
val javaCompileVersion = JavaVersion.VERSION_11
val javaCompileVersion = JavaVersion.VERSION_17
val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(11)
}

6
plugins/src/main/kotlin/extension/CommonExtension.kt
View File

@@ -32,8 +32,8 @@ fun CommonExtension<*, *, *, *>.androidConfig(project: Project) {
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
testOptions {
@@ -58,7 +58,7 @@ fun CommonExtension<*, *, *, *>.composeConfig(libs: LibrariesForLibs) {
kotlinCompilerExtensionVersion = libs.versions.composecompiler.get()
}
packagingOptions {
packaging {
resources.excludes.apply {
add("META-INF/AL2.0")
add("META-INF/LGPL2.1")

9
plugins/src/main/kotlin/extension/DependencyHandleScope.kt
View File

@@ -16,14 +16,17 @@
package extension
import gradle.kotlin.dsl.accessors._71f190358cebd46a469f2989484fd643.androidTestImplementation
import gradle.kotlin.dsl.accessors._71f190358cebd46a469f2989484fd643.debugImplementation
import gradle.kotlin.dsl.accessors._71f190358cebd46a469f2989484fd643.implementation
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.kotlin.dsl.DependencyHandlerScope
import org.gradle.kotlin.dsl.project
import java.io.File
private fun DependencyHandlerScope.implementation(dependency: Any) = dependencies.add("implementation", dependency)
private fun DependencyHandlerScope.androidTestImplementation(dependency: Any) = dependencies.add("androidTestImplementation", dependency)
private fun DependencyHandlerScope.debugImplementation(dependency: Any) = dependencies.add("debugImplementation", dependency)
/**
* Dependencies used by all the modules
*/

1
plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
View File

@@ -24,7 +24,6 @@ import extension.composeDependencies
import org.gradle.accessors.dm.LibrariesForLibs
val libs = the<LibrariesForLibs>()
plugins {
id("com.android.application")
id("kotlin-android")

1
plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
View File

@@ -24,7 +24,6 @@ import extension.composeDependencies
import org.gradle.accessors.dm.LibrariesForLibs
val libs = the<LibrariesForLibs>()
plugins {
id("com.android.library")
id("kotlin-android")

1
plugins/src/main/kotlin/io.element.android-library.gradle.kts
View File

@@ -22,7 +22,6 @@ import extension.commonDependencies
import org.gradle.accessors.dm.LibrariesForLibs
val libs = the<LibrariesForLibs>()
plugins {
id("com.android.library")
id("kotlin-android")