Skip to content

Commit e8baf2d

Browse files
esensaresensar
committed
Migrate to version catalog
1 parent e4c6ad9 commit e8baf2d

File tree

8 files changed

+216
-120
lines changed

8 files changed

+216
-120
lines changed

‎app/build.gradle‎

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

‎app/build.gradle.kts‎

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

‎app/schemas/com.simplemobiletools.keyboard.databases.ClipsDatabase/1.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 1,
5+
"identityHash": "af614a2263d4c4176a70e1121a2d16bc",
6+
"entities": [
7+
{
8+
"tableName": "clips",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `value` TEXT NOT NULL)",
10+
"fields": [
11+
{
12+
"fieldPath": "id",
13+
"columnName": "id",
14+
"affinity": "INTEGER",
15+
"notNull": false
16+
},
17+
{
18+
"fieldPath": "value",
19+
"columnName": "value",
20+
"affinity": "TEXT",
21+
"notNull": true
22+
}
23+
],
24+
"primaryKey": {
25+
"autoGenerate": true,
26+
"columnNames": [
27+
"id"
28+
]
29+
},
30+
"indices": [
31+
{
32+
"name": "index_clips_id",
33+
"unique": true,
34+
"columnNames": [
35+
"id"
36+
],
37+
"orders": [],
38+
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_clips_id` ON `${TABLE_NAME}` (`id`)"
39+
}
40+
],
41+
"foreignKeys": []
42+
}
43+
],
44+
"views": [],
45+
"setupQueries": [
46+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
47+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'af614a2263d4c4176a70e1121a2d16bc')"
48+
]
49+
}
50+
}

‎build.gradle‎

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

‎build.gradle.kts‎

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

‎gradle/libs.versions.toml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
[versions]
2+
#jetbrains
3+
kotlin = "1.9.0"
4+
#AndroidX
5+
androidx-autofill = "1.1.0"
6+
androidx-emoji2 = "1.4.0"
7+
#KSP
8+
ksp = "1.9.0-1.0.12"
9+
#Room
10+
room = "2.6.0-beta01"
11+
#Simple tools
12+
simple-commons = "0e173dc5ad"
13+
#Gradle
14+
gradlePlugins-agp = "8.1.0"
15+
#build
16+
app-build-compileSDKVersion = "34"
17+
app-build-targetSDK = "34"
18+
app-build-minimumSDK = "23"
19+
app-build-javaVersion = "VERSION_17"
20+
app-build-kotlinJVMTarget = "17"
21+
#versioning
22+
app-version-appId = "com.simplemobiletools.keyboard"
23+
app-version-versionCode = "22"
24+
app-version-versionName = "5.4.7"
25+
[libraries]
26+
#AndroidX
27+
androidx-autofill = { module = "androidx.autofill:autofill", version.ref = "androidx-autofill" }
28+
androidx-emoji2-bundled = { module = "androidx.emoji2:emoji2-bundled", version.ref = "androidx-emoji2" }
29+
#Room
30+
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
31+
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
32+
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
33+
#Simple Mobile Tools
34+
simple-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" }
35+
[bundles]
36+
room = [
37+
"androidx-room-ktx",
38+
"androidx-room-runtime",
39+
]
40+
[plugins]
41+
android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
42+
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
43+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

‎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)