Skip to content

Commit 7c27f08

Browse files
authored
Merge pull request #290 from esensar/version-catalog-migration
Migrate to versions catalog
2 parents d09b75d + 3f79998 commit 7c27f08

7 files changed

Lines changed: 140 additions & 113 deletions

File tree

app/build.gradle

Lines changed: 0 additions & 82 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
import java.io.FileInputStream
2+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3+
import org.jetbrains.kotlin.konan.properties.Properties
4+
5+
plugins {
6+
alias(libs.plugins.android)
7+
alias(libs.plugins.kotlinAndroid)
8+
}
9+
10+
val keystorePropertiesFile: File = rootProject.file("keystore.properties")
11+
val keystoreProperties = Properties()
12+
if (keystorePropertiesFile.exists()) {
13+
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
14+
}
15+
16+
android {
17+
compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
18+
19+
defaultConfig {
20+
applicationId = libs.versions.app.version.appId.get()
21+
minSdk = project.libs.versions.app.build.minimumSDK.get().toInt()
22+
targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
23+
versionName = project.libs.versions.app.version.versionName.get()
24+
versionCode = project.libs.versions.app.version.versionCode.get().toInt()
25+
setProperty("archivesBaseName", "draw")
26+
vectorDrawables.useSupportLibrary = true
27+
}
28+
29+
signingConfigs {
30+
if (keystorePropertiesFile.exists()) {
31+
register("release") {
32+
keyAlias = keystoreProperties.getProperty("keyAlias")
33+
keyPassword = keystoreProperties.getProperty("keyPassword")
34+
storeFile = file(keystoreProperties.getProperty("storeFile"))
35+
storePassword = keystoreProperties.getProperty("storePassword")
36+
}
37+
}
38+
}
39+
40+
buildFeatures {
41+
viewBinding = true
42+
buildConfig = true
43+
}
44+
45+
buildTypes {
46+
debug {
47+
applicationIdSuffix = ".debug"
48+
}
49+
release {
50+
isMinifyEnabled = true
51+
proguardFiles(
52+
getDefaultProguardFile("proguard-android-optimize.txt"),
53+
"proguard-rules.pro"
54+
)
55+
if (keystorePropertiesFile.exists()) {
56+
signingConfig = signingConfigs.getByName("release")
57+
}
58+
}
59+
}
60+
61+
flavorDimensions.add("variants")
62+
productFlavors {
63+
register("core")
64+
register("fdroid")
65+
register("prepaid")
66+
}
67+
68+
sourceSets {
69+
getByName("main").java.srcDirs("src/main/kotlin")
70+
}
71+
72+
compileOptions {
73+
val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString())
74+
sourceCompatibility = currentJavaVersionFromLibs
75+
targetCompatibility = currentJavaVersionFromLibs
76+
}
77+
78+
tasks.withType<KotlinCompile> {
79+
kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
80+
}
81+
82+
namespace = libs.versions.app.version.appId.get()
83+
84+
lint {
85+
checkReleaseBuilds = false
86+
abortOnError = false
87+
}
88+
}
89+
90+
dependencies {
91+
implementation(libs.simple.tools.commons)
92+
implementation(libs.androidx.print)
93+
}

build.gradle

Lines changed: 0 additions & 30 deletions
This file was deleted.

build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
plugins {
2+
alias(libs.plugins.android).apply(false)
3+
alias(libs.plugins.kotlinAndroid).apply(false)
4+
}

gradle/libs.versions.toml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[versions]
2+
#jetbrains
3+
kotlin = "1.9.0"
4+
#AndroidX
5+
androidx-print = "1.0.0"
6+
#Simple tools
7+
simple-commons = "0e173dc5ad"
8+
#Gradle
9+
gradlePlugins-agp = "8.1.0"
10+
#build
11+
app-build-compileSDKVersion = "34"
12+
app-build-targetSDK = "34"
13+
app-build-minimumSDK = "23"
14+
app-build-javaVersion = "VERSION_17"
15+
app-build-kotlinJVMTarget = "17"
16+
#versioning
17+
app-version-appId = "com.simplemobiletools.draw.pro"
18+
app-version-versionCode = "79"
19+
app-version-versionName = "6.9.3"
20+
[libraries]
21+
#AndroidX
22+
androidx-print = { module = "androidx.print:print", version.ref = "androidx-print" }
23+
#Simple Mobile Tools
24+
simple-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" }
25+
[plugins]
26+
android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
27+
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

settings.gradle

Lines changed: 0 additions & 1 deletion
This file was deleted.

settings.gradle.kts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
google()
5+
mavenCentral()
6+
}
7+
}
8+
dependencyResolutionManagement {
9+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
10+
repositories {
11+
google()
12+
mavenCentral()
13+
maven { setUrl("https://jitpack.io") }
14+
}
15+
}
16+
include(":app")

0 commit comments

Comments
 (0)