From 198d2561715c1862515b62c9a10be983920934b9 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Fri, 6 Oct 2023 23:20:27 +0200 Subject: [PATCH] revert --- app/build.gradle | 36 ++++++++++++++++++------------------ build.gradle | 16 +++++----------- settings.gradle | 2 +- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 307326a3b..f96c0f560 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,9 +1,9 @@ plugins { - id "com.android.application" version "8.1.0" + id 'com.android.application' id 'kotlin-kapt' - id "org.jetbrains.kotlin.android" version "1.5.31" + id 'org.jetbrains.kotlin.android' id 'com.google.dagger.hilt.android' -// id 'org.jlleitschuh.gradle.ktlint' version '11.2.0' + id 'org.jlleitschuh.gradle.ktlint' version '11.2.0' } android { @@ -34,7 +34,7 @@ android { } } compileOptions { -// coreLibraryDesugaringEnabled true + coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -45,7 +45,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.3' + kotlinCompilerExtensionVersion '1.4.2' } packagingOptions { resources { @@ -54,13 +54,13 @@ android { excludes += '/META-INF/LICENSE-notice.md' } } -// testOptions { -// packagingOptions { -// jniLibs { -// useLegacyPackaging true -// } -// } -// } + testOptions { + packagingOptions { + jniLibs { + useLegacyPackaging true + } + } + } kapt { arguments { arg("skipPrivatePreviews", "true") @@ -69,9 +69,9 @@ android { } dependencies { -// implementation project(':components') + implementation project(':components') //Desugaring for use of java.time in api lower then 26 -// coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2' //Base android deps implementation 'androidx.core:core-ktx:1.9.0' @@ -156,7 +156,7 @@ dependencies { tasks.withType(Test) { useJUnitPlatform() } -// -//kapt { -// correctErrorTypes true -//} + +kapt { + correctErrorTypes true +} diff --git a/build.gradle b/build.gradle index dc19dbea8..b60e28894 100644 --- a/build.gradle +++ b/build.gradle @@ -3,19 +3,13 @@ buildscript { compose_version = '1.3.3' ktor_version = '2.3.4' } - dependencies { - - } }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id "com.android.application" version "8.1.0" apply false - id "com.android.library" version "8.1.0" apply false - id "org.jetbrains.kotlin.android" version "1.5.31" apply false -// id 'app.cash.paparazzi' version '1.2.0' apply false - -// id 'com.android.library' version '7.4.1' apply false -// id 'org.jetbrains.kotlin.android' version '1.8.10' apply false + id 'app.cash.paparazzi' version '1.2.0' apply false + id 'com.android.application' version '7.4.1' apply false + id 'com.android.library' version '7.4.1' apply false + id 'org.jetbrains.kotlin.android' version '1.8.10' apply false id 'com.google.dagger.hilt.android' version '2.45' apply false -// id 'org.jetbrains.kotlin.jvm' version '1.8.10' apply false + id 'org.jetbrains.kotlin.jvm' version '1.8.10' apply false } diff --git a/settings.gradle b/settings.gradle index b2e9d2945..7e7a41fb0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,4 +15,4 @@ dependencyResolutionManagement { rootProject.name = "Loudius" include ':app' include ':custom-ktlint-rules' -//include ':components' +include ':components'