Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-11-22 01:04:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gradle downgrade , java 8 compatibility

Browse Source
This commit is contained in:
shabinder 2021-05-21 00:05:09 +05:30
parent 99cce337c6
commit 5f5473aaf7
8 changed files with 10 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle.kts
View File

@ -35,9 +35,6 @@ allprojects {
useIR = true useIR = true
} }
} }
tasks.withType<org.gradle.jvm.tasks.Jar> {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
afterEvaluate { afterEvaluate {
project.extensions.findByType<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension>()?.let { kmpExt -> project.extensions.findByType<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension>()?.let { kmpExt ->
kmpExt.sourceSets.removeAll { it.name == "androidAndroidTestRelease" } kmpExt.sourceSets.removeAll { it.name == "androidAndroidTestRelease" }

2
buildSrc/build.gradle.kts
View File

@ -30,7 +30,7 @@ repositories {
} }
dependencies { 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("org.jlleitschuh.gradle:ktlint-gradle:${Versions.ktLint}")
implementation(JetBrains.Compose.gradlePlugin) implementation(JetBrains.Compose.gradlePlugin)
implementation(JetBrains.Kotlin.gradlePlugin) implementation(JetBrains.Kotlin.gradlePlugin)

6
buildSrc/src/main/kotlin/android-setup.gradle.kts
View File

@ -22,11 +22,11 @@ plugins {
} }
android { android {
compileSdk = (29) compileSdkVersion(29)
defaultConfig { defaultConfig {
minSdk = (Versions.minSdkVersion) minSdkVersion(Versions.minSdkVersion)
targetSdk = (Versions.targetSdkVersion) targetSdkVersion(Versions.targetSdkVersion)
} }
compileOptions { compileOptions {

11
buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts
View File

@ -22,17 +22,6 @@ plugins {
id("ktlint-setup") id("ktlint-setup")
} }
android {
configurations {
create("androidTestApi")
create("androidTestDebugApi")
create("androidTestReleaseApi")
create("testApi")
create("testDebugApi")
create("testReleaseApi")
}
}
kotlin { kotlin {
jvm("desktop").compilations.all { jvm("desktop").compilations.all {
kotlinOptions { kotlinOptions {

8
buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts
View File

@ -54,19 +54,19 @@ kotlin {
sourceSets { sourceSets {
named("commonTest") { named("commonTest") {
dependencies { dependencies {
implementation(JetBrains.Kotlin.testCommon) //implementation(JetBrains.Kotlin.testCommon)
implementation(JetBrains.Kotlin.testAnnotationsCommon) //implementation(JetBrains.Kotlin.testAnnotationsCommon)
} }
} }
named("androidTest") { named("androidTest") {
dependencies { dependencies {
implementation(JetBrains.Kotlin.testJunit) //implementation(JetBrains.Kotlin.testJunit)
} }
} }
named("desktopTest") { named("desktopTest") {
dependencies { dependencies {
implementation(JetBrains.Kotlin.testJunit) //implementation(JetBrains.Kotlin.testJunit)
} }
} }
named("jsTest") { named("jsTest") {

11
buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts
View File

@ -22,17 +22,6 @@ plugins {
id("kotlin-parcelize") id("kotlin-parcelize")
} }
android {
configurations {
create("androidTestApi")
create("androidTestDebugApi")
create("androidTestReleaseApi")
create("testApi")
create("testDebugApi")
create("testReleaseApi")
}
}
kotlin { kotlin {
/*IOS Target Can be only built on Mac*/ /*IOS Target Can be only built on Mac*/
if(HostOS.isMac){ if(HostOS.isMac){

19
common/compose/build.gradle.kts
View File

@ -38,24 +38,5 @@ kotlin {
implementation(Decompose.extensionsCompose) 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)
}
}
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c distributionSha256Sum=e2774e6fb77c43657decde25542dea710aafd78c4022d19b196e7e78d79d8c6c
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists