From 5f5473aaf7e0d24159aba5fcda8bca4cdbcfe96e Mon Sep 17 00:00:00 2001 From: shabinder Date: Fri, 21 May 2021 00:05:09 +0530 Subject: [PATCH] gradle downgrade , java 8 compatibility --- build.gradle.kts | 3 --- buildSrc/build.gradle.kts | 2 +- .../src/main/kotlin/android-setup.gradle.kts | 6 +++--- .../multiplatform-compose-setup.gradle.kts | 11 ----------- .../multiplatform-setup-test.gradle.kts | 8 ++++---- .../kotlin/multiplatform-setup.gradle.kts | 11 ----------- common/compose/build.gradle.kts | 19 ------------------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 10 insertions(+), 54 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2076df8c..9c115950 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,9 +35,6 @@ allprojects { useIR = true } } - tasks.withType { - duplicatesStrategy = DuplicatesStrategy.INCLUDE - } afterEvaluate { project.extensions.findByType()?.let { kmpExt -> kmpExt.sourceSets.removeAll { it.name == "androidAndroidTestRelease" } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4a77c1c8..48ae8147 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -30,7 +30,7 @@ repositories { } dependencies { - implementation("com.android.tools.build:gradle:7.1.0-alpha01") + implementation("com.android.tools.build:gradle:4.1.1") implementation("org.jlleitschuh.gradle:ktlint-gradle:${Versions.ktLint}") implementation(JetBrains.Compose.gradlePlugin) implementation(JetBrains.Kotlin.gradlePlugin) diff --git a/buildSrc/src/main/kotlin/android-setup.gradle.kts b/buildSrc/src/main/kotlin/android-setup.gradle.kts index 59a49b17..1d18ea6b 100644 --- a/buildSrc/src/main/kotlin/android-setup.gradle.kts +++ b/buildSrc/src/main/kotlin/android-setup.gradle.kts @@ -22,11 +22,11 @@ plugins { } android { - compileSdk = (29) + compileSdkVersion(29) defaultConfig { - minSdk = (Versions.minSdkVersion) - targetSdk = (Versions.targetSdkVersion) + minSdkVersion(Versions.minSdkVersion) + targetSdkVersion(Versions.targetSdkVersion) } compileOptions { diff --git a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts index bf11524e..37374c07 100644 --- a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts @@ -22,17 +22,6 @@ plugins { id("ktlint-setup") } -android { - configurations { - create("androidTestApi") - create("androidTestDebugApi") - create("androidTestReleaseApi") - create("testApi") - create("testDebugApi") - create("testReleaseApi") - } -} - kotlin { jvm("desktop").compilations.all { kotlinOptions { diff --git a/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts index 3ba1b6c2..dbfdbe57 100644 --- a/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts @@ -54,19 +54,19 @@ kotlin { sourceSets { named("commonTest") { dependencies { - implementation(JetBrains.Kotlin.testCommon) - implementation(JetBrains.Kotlin.testAnnotationsCommon) + //implementation(JetBrains.Kotlin.testCommon) + //implementation(JetBrains.Kotlin.testAnnotationsCommon) } } named("androidTest") { dependencies { - implementation(JetBrains.Kotlin.testJunit) + //implementation(JetBrains.Kotlin.testJunit) } } named("desktopTest") { dependencies { - implementation(JetBrains.Kotlin.testJunit) + //implementation(JetBrains.Kotlin.testJunit) } } named("jsTest") { diff --git a/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts index df4df9fb..c00a376e 100644 --- a/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts @@ -22,17 +22,6 @@ plugins { id("kotlin-parcelize") } -android { - configurations { - create("androidTestApi") - create("androidTestDebugApi") - create("androidTestReleaseApi") - create("testApi") - create("testDebugApi") - create("testReleaseApi") - } -} - kotlin { /*IOS Target Can be only built on Mac*/ if(HostOS.isMac){ diff --git a/common/compose/build.gradle.kts b/common/compose/build.gradle.kts index f955a143..fda7d277 100644 --- a/common/compose/build.gradle.kts +++ b/common/compose/build.gradle.kts @@ -38,24 +38,5 @@ kotlin { implementation(Decompose.extensionsCompose) } } - - // Testing Source-sets - named("commonTest") { - dependencies { - implementation(JetBrains.Kotlin.testCommon) - implementation(JetBrains.Kotlin.testAnnotationsCommon) - } - } - - named("androidTest") { - dependencies { - implementation(JetBrains.Kotlin.testJunit) - } - } - named("desktopTest") { - dependencies { - implementation(JetBrains.Kotlin.testJunit) - } - } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4e77d0c2..87e87435 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionSha256Sum=e2774e6fb77c43657decde25542dea710aafd78c4022d19b196e7e78d79d8c6c +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists