Skip to content

Commit

Permalink
Merge pull request #187 from LachlanMcKee/migrate-gradle-to-kotlin
Browse files Browse the repository at this point in the history
Migrated to gradle kts
  • Loading branch information
LachlanMcKee authored Feb 11, 2023
2 parents 8eb4acf + 1b3a04b commit 3388af9
Show file tree
Hide file tree
Showing 29 changed files with 541 additions and 617 deletions.
31 changes: 0 additions & 31 deletions binder/build.gradle

This file was deleted.

27 changes: 27 additions & 0 deletions binder/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
plugins {
id("java")
id("mvi-core-publish-java")
id("kotlin")
id("org.jetbrains.dokka")
id("mvi-core-detekt")
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

tasks.withType<Test> {
useJUnitPlatform()
}

dependencies {
implementation(libs.rxjava2)
implementation(libs.rxkotlin)
implementation(libs.kotlin.stdlib)

testImplementation(libs.junit5)
testImplementation(libs.junit.params)
testImplementation(libs.junit.platform.launcher)
testImplementation(libs.mockito.kotlin)
}
12 changes: 6 additions & 6 deletions build.gradle → build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ buildscript {
mavenCentral()
}
dependencies {
classpath libs.plugin.android
classpath libs.plugin.kotlin
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.kotlinVersion.get()}"
classpath(libs.plugin.android)
classpath(libs.plugin.kotlin)
classpath("org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.kotlinVersion.get()}")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

plugins {
id 'mvi-core-collect-sarif'
id("mvi-core-collect-sarif")
}

task clean(type: Delete) {
delete rootProject.buildDir
tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
}
66 changes: 0 additions & 66 deletions mvicore-android/build.gradle

This file was deleted.

56 changes: 56 additions & 0 deletions mvicore-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
plugins {
id("com.android.library")
id("kotlin-android")
id("org.jetbrains.dokka")
id("mvi-core-publish-android")
id("mvi-core-lint")
id("mvi-core-detekt")
}

group = "com.github.badoo.mvicore"

android {
compileSdk = 33

defaultConfig {
minSdk = 15
targetSdk = 33
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}

testOptions {
unitTests.all {
it.useJUnitPlatform()
}
}
}

dependencies {
implementation(libs.androidx.appcompat)
implementation(libs.androidx.lifecycle.java8)
implementation(libs.kotlin.stdlib)

implementation(libs.rxjava2)
implementation(libs.rxkotlin)
implementation(libs.rxandroid)

testImplementation(libs.junit5)
testImplementation(libs.junit.params)
testImplementation(libs.junit.platform.launcher)

androidTestImplementation(libs.junit)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.androidx.test.rules)

implementation(project(":mvicore"))
}
54 changes: 0 additions & 54 deletions mvicore-debugdrawer/build.gradle

This file was deleted.

46 changes: 46 additions & 0 deletions mvicore-debugdrawer/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
plugins {
id("com.android.library")
id("kotlin-android")
id("org.jetbrains.dokka")
id("mvi-core-publish-android")
id("mvi-core-lint")
id("mvi-core-detekt")
}

group = "com.github.badoo.mvicore"

android {
compileSdk = 33
defaultConfig {
minSdk = 19
targetSdk = 33
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
}

dependencies {
implementation(libs.androidx.constraintlayout)

implementation(libs.rxjava2)
implementation(libs.rxkotlin)

implementation(libs.kotlin.stdlib)

implementation(libs.debugdrawer.base)
debugImplementation(libs.debugdrawer.impl)
debugImplementation(libs.debugdrawer.view.impl)
releaseImplementation(libs.debugdrawer.noop)
releaseImplementation(libs.debugdrawer.view.noop)

implementation(project(":mvicore"))
}
88 changes: 0 additions & 88 deletions mvicore-demo/mvicore-demo-app/build.gradle

This file was deleted.

Loading

0 comments on commit 3388af9

Please sign in to comment.