From 465d9f4fdb477e3009aadea5f933ea379576cc95 Mon Sep 17 00:00:00 2001 From: X1nto Date: Fri, 8 Oct 2021 15:45:01 +0400 Subject: [PATCH] buildscript cleanup --- app/build.gradle.kts | 21 ++++----------------- buildSrc/build.gradle.kts | 9 --------- buildSrc/src/main/java/Config.kt | 5 ----- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 buildSrc/build.gradle.kts delete mode 100644 buildSrc/src/main/java/Config.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a7e04f3f..bd1e72f6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,12 +43,13 @@ android { buildFeatures { viewBinding = true - //compose = true } packagingOptions { - exclude("META-INF/DEPENDENCIES") - exclude("META-INF/*.kotlin_module") + resources { + excludes += "META-INF/DEPENDENCIES" + excludes += "META-INF/*.kotlin_module" + } } // To inline the bytecode built with JVM target 1.8 into @@ -62,7 +63,6 @@ android { tasks.withType { kotlinOptions { jvmTarget = "1.8" - //useIR = true } } @@ -86,7 +86,6 @@ val languages: String get() { dependencies { - //val composeVersion = "1.0.0-alpha12" implementation(project(":core-presentation")) implementation(project(":core-ui")) @@ -111,18 +110,6 @@ dependencies { implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.work:work-runtime-ktx:2.7.0-rc01") - - // Compose -// implementation("androidx.compose.ui:ui:$composeVersion") -// implementation("androidx.compose.ui:ui-tooling:$composeVersion") -// implementation("androidx.compose.foundation:foundation:$composeVersion") -// implementation("androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha02") -// implementation("androidx.compose.material:material:$composeVersion") -// implementation("androidx.compose.material:material-icons-core:$composeVersion") -// implementation("androidx.compose.material:material-icons-extended:$composeVersion") -// implementation("androidx.compose.runtime:runtime-livedata:$composeVersion") - - // Appearance implementation("com.github.madrapps:pikolo:2.0.1") implementation("com.google.android.material:material:1.4.0") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index 051fc628..00000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - `kotlin-dsl` -} - -repositories { - google() - jcenter() - maven(url = "https://jitpack.io") -} \ No newline at end of file diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt deleted file mode 100644 index ce6e1f7e..00000000 --- a/buildSrc/src/main/java/Config.kt +++ /dev/null @@ -1,5 +0,0 @@ -object Config { - - const val kotlinVersion = "1.4.21" - -} \ No newline at end of file