Skip to content

Commit 3c89acd

Browse files
authored
Merge pull request #744 from esensar/version-catalog-migration
Migrate to version catalog
2 parents 7d43654 + d36d12c commit 3c89acd

File tree

7 files changed

+164
-121
lines changed

7 files changed

+164
-121
lines changed

app/build.gradle

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

app/build.gradle.kts

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
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", "file-manager")
26+
multiDexEnabled = true
27+
vectorDrawables.useSupportLibrary = true
28+
}
29+
30+
signingConfigs {
31+
if (keystorePropertiesFile.exists()) {
32+
register("release") {
33+
keyAlias = keystoreProperties.getProperty("keyAlias")
34+
keyPassword = keystoreProperties.getProperty("keyPassword")
35+
storeFile = file(keystoreProperties.getProperty("storeFile"))
36+
storePassword = keystoreProperties.getProperty("storePassword")
37+
}
38+
}
39+
}
40+
41+
buildFeatures {
42+
viewBinding = true
43+
buildConfig = true
44+
}
45+
46+
buildTypes {
47+
debug {
48+
applicationIdSuffix = ".debug"
49+
}
50+
release {
51+
isMinifyEnabled = true
52+
proguardFiles(
53+
getDefaultProguardFile("proguard-android-optimize.txt"),
54+
"proguard-rules.pro"
55+
)
56+
if (keystorePropertiesFile.exists()) {
57+
signingConfig = signingConfigs.getByName("release")
58+
}
59+
}
60+
}
61+
62+
flavorDimensions.add("variants")
63+
productFlavors {
64+
register("core")
65+
register("fdroid")
66+
register("prepaid")
67+
}
68+
69+
sourceSets {
70+
getByName("main").java.srcDirs("src/main/kotlin")
71+
}
72+
73+
compileOptions {
74+
val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString())
75+
sourceCompatibility = currentJavaVersionFromLibs
76+
targetCompatibility = currentJavaVersionFromLibs
77+
}
78+
79+
tasks.withType<KotlinCompile> {
80+
kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
81+
}
82+
83+
namespace = libs.versions.app.version.appId.get()
84+
85+
lint {
86+
checkReleaseBuilds = false
87+
abortOnError = false
88+
}
89+
}
90+
91+
dependencies {
92+
implementation(libs.simple.tools.commons)
93+
implementation(libs.androidx.documentfile)
94+
implementation(libs.androidx.swiperefreshlayout)
95+
implementation(libs.androidpdfviewer)
96+
implementation(libs.roottools)
97+
implementation(libs.rootshell)
98+
implementation(libs.gestureviews)
99+
implementation(libs.autofittextview)
100+
implementation(libs.zip4j)
101+
}

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: 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-swiperefreshlayout = "1.1.0"
6+
androidx-documentfile = "1.0.1"
7+
#Simple tools
8+
simple-commons = "d1629c7f1a"
9+
#Other
10+
autofittextview = "0.2.1"
11+
gestureviews = "2.5.2"
12+
androidpdfviewer = "e6a533125b"
13+
rootshell = "1.6"
14+
roottools = "df729dcb13"
15+
zip4j = "2.11.5"
16+
#Gradle
17+
gradlePlugins-agp = "8.1.0"
18+
#build
19+
app-build-compileSDKVersion = "34"
20+
app-build-targetSDK = "34"
21+
app-build-minimumSDK = "23"
22+
app-build-javaVersion = "VERSION_17"
23+
app-build-kotlinJVMTarget = "17"
24+
#versioning
25+
app-version-appId = "com.simplemobiletools.filemanager.pro"
26+
app-version-versionCode = "135"
27+
app-version-versionName = "6.16.0"
28+
[libraries]
29+
#AndroidX
30+
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "androidx-swiperefreshlayout" }
31+
androidx-documentfile = { module = "androidx.documentfile:documentfile", version.ref = "androidx-documentfile" }
32+
#Simple Mobile Tools
33+
simple-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" }
34+
#Other
35+
androidpdfviewer = { module = "com.github.tibbi:AndroidPdfViewer", version.ref = "androidpdfviewer" }
36+
autofittextview = { module = "me.grantland:autofittextview", version.ref = "autofittextview" }
37+
gestureviews = { module = "com.alexvasilkov:gesture-views", version.ref = "gestureviews" }
38+
rootshell = { module = "com.github.Stericson:RootShell", version.ref = "rootshell" }
39+
roottools = { module = "com.github.Stericson:RootTools", version.ref = "roottools" }
40+
zip4j = { module = "net.lingala.zip4j:zip4j", version.ref = "zip4j" }
41+
[plugins]
42+
android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
43+
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)