Skip to content

Commit

Permalink
Migrate build scripts to .kts
Browse files Browse the repository at this point in the history
  • Loading branch information
saket committed Sep 21, 2023
1 parent a14b311 commit fe3831c
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 102 deletions.
9 changes: 1 addition & 8 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
[*.{kt, kts}]
[*]
indent_size = 2
insert_final_newline = true
max_line_length = 120

[*.xml]
insert_final_newline = true

[*.gradle]
indent_size = 2
insert_final_newline = true
12 changes: 5 additions & 7 deletions build.gradle → build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
import com.android.build.gradle.BaseExtension as AndroidBaseExtension
import com.android.build.gradle.BasePlugin as AndroidBasePlugin

buildscript {
repositories {
Expand All @@ -18,20 +20,16 @@ plugins {
alias(libs.plugins.dokka) apply false
}

tasks.register('clean', Delete) {
delete rootProject.buildDir
}

allprojects {
plugins.withType(com.android.build.gradle.BasePlugin).configureEach {
project.android {
plugins.withType<AndroidBasePlugin>().configureEach {
configure<AndroidBaseExtension> {
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
}
tasks.withType(KotlinJvmCompile).configureEach {
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
Expand Down
47 changes: 0 additions & 47 deletions library/build.gradle

This file was deleted.

46 changes: 46 additions & 0 deletions library/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.mavenPublish)
alias(libs.plugins.paparazzi)
}

android {
namespace = "me.saket.swipe"

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
compileSdk = libs.versions.compileSdk.get().toInt()
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(11))
}
lint {
abortOnError = true
}
}

dependencies {
implementation(libs.compose.ui)
implementation(libs.compose.foundation)

testImplementation(libs.junit)
testImplementation(libs.compose.material3)
testImplementation(libs.compose.materialIcons)
testImplementation(libs.androidx.savedstate)
testImplementation(libs.androidx.lifecycle)
}

// Used on CI to prevent publishing of non-snapshot versions.
tasks.register("throwIfVersionIsNotSnapshot") {
val libraryVersion = properties["VERSION_NAME"] as String
check(libraryVersion.endsWith("SNAPSHOT")) {
"Project isn't using a snapshot version = $libraryVersion"
}
}
40 changes: 0 additions & 40 deletions sample/build.gradle

This file was deleted.

39 changes: 39 additions & 0 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
}

android {
namespace = "me.saket.swipe.sample"

defaultConfig {
applicationId = namespace
minSdk = 31
compileSdk = libs.versions.compileSdk.get().toInt()
versionCode = 1
versionName = "1.0"
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(11))
}
lint {
abortOnError = true
}
}

dependencies {
implementation(projects.library)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.activity)
implementation(libs.compose.foundation)
implementation(libs.compose.ui)
implementation(libs.compose.material3)
implementation(libs.compose.materialIcons)
implementation(libs.accompanist.systemUi)
}

0 comments on commit fe3831c

Please sign in to comment.