Skip to content

Commit

Permalink
Merge pull request #482 from lucasnlm/new-build
Browse files Browse the repository at this point in the history
Migrate gradle to gradle.kts
  • Loading branch information
lucasnlm committed Nov 18, 2023
2 parents ee56dfc + 2b3d62d commit 6b5a457
Show file tree
Hide file tree
Showing 71 changed files with 1,824 additions and 1,887 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Run script
run: |
chmod +x ./gdx/check_import.sh
bash ./gdx/check_import.sh ./gdx/build.gradle
bash ./gdx/check_import.sh ./gdx/build.gradle.kts
shell: bash

ktlint:
Expand Down
80 changes: 0 additions & 80 deletions about/build.gradle

This file was deleted.

82 changes: 82 additions & 0 deletions about/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
plugins {
id("com.android.library")
id("kotlin-android")
}

android {
namespace = "dev.lucasnlm.antimine.about"

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
compileSdk = libs.versions.compileSdk.get().toInt()

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}

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

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

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}

buildFeatures {
buildConfig = true
viewBinding = true
}
}

dependencies {
implementation(project(":core"))
implementation(project(":i18n"))
implementation(project(":preferences"))
implementation(project(":ui"))
implementation(project(":utils"))
implementation(project(":tutorial"))
implementation(project(":external"))

// Google
implementation(libs.material)

// AndroidX
implementation(libs.appcompat)
implementation(libs.activity.ktx)
implementation(libs.fragment.ktx)

// RecyclerView
implementation(libs.recyclerview)

// Constraint
implementation(libs.constraintlayout)

// Lifecycle
implementation(libs.lifecycle.viewmodel.ktx)

// Koin
implementation(libs.koin.android)
testImplementation(libs.koin.test)

// Coroutines
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.coroutines.android)
testImplementation(libs.kotlinx.coroutines.test)

// Kotlin Lib
implementation(libs.kotlin.stdlib)

// Unit Tests
testImplementation(libs.junit)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.kotlin)
testImplementation(libs.mockk)
}
24 changes: 3 additions & 21 deletions about/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
-dontwarn java.lang.invoke.StringConcatFactory
-dontwarn com.google.android.material.R$attr
-dontwarn dev.lucasnlm.antimine.i18n.R$string
Loading

0 comments on commit 6b5a457

Please sign in to comment.