Skip to content

Commit 573fead

Browse files
aualbertaualbert
authoredJun 15, 2024
Migrate to Gradle Kotlin DSL, version catalog and ksp (Ashinch#744)
1 parent 688eabd commit 573fead

File tree

9 files changed

+344
-284
lines changed

9 files changed

+344
-284
lines changed
 

‎app/build.gradle

-222
This file was deleted.

‎app/build.gradle.kts

+185
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
import java.util.Properties
2+
import java.io.FileInputStream
3+
4+
plugins {
5+
alias(libs.plugins.kotlin.android)
6+
alias(libs.plugins.android.application)
7+
alias(libs.plugins.ksp)
8+
alias(libs.plugins.aboutlibraries)
9+
alias(libs.plugins.room)
10+
alias(libs.plugins.hilt)
11+
}
12+
13+
fun fetchGitCommitHash(): String {
14+
val process = ProcessBuilder("git", "rev-parse", "--verify", "--short", "HEAD")
15+
.redirectErrorStream(true)
16+
.start()
17+
return process.inputStream.bufferedReader().use { it.readText().trim() }
18+
}
19+
20+
val gitCommitHash = fetchGitCommitHash()
21+
val keyProps = Properties()
22+
val keyPropsFile: File = rootProject.file("signature/keystore.properties")
23+
if (keyPropsFile.exists()) {
24+
println("Loading keystore properties from ${keyPropsFile.absolutePath}")
25+
keyProps.load(FileInputStream(keyPropsFile))
26+
}
27+
28+
android {
29+
compileSdk = 34
30+
31+
defaultConfig {
32+
applicationId = "me.ash.reader"
33+
minSdk = 26
34+
targetSdk = 33
35+
versionCode = 25
36+
versionName = "0.10.1"
37+
38+
buildConfigField("String", "USER_AGENT_STRING", "\"ReadYou/${'$'}{versionName}(${versionCode})\"")
39+
40+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
41+
vectorDrawables.useSupportLibrary = true
42+
43+
room {
44+
schemaDirectory("$projectDir/schemas")
45+
}
46+
47+
ksp {
48+
arg("room.incremental","true")
49+
}
50+
}
51+
52+
flavorDimensions.add("channel")
53+
productFlavors {
54+
create("github") {
55+
dimension = "channel"
56+
}
57+
create("fdroid") {
58+
dimension = "channel"
59+
}
60+
create("googlePlay") {
61+
dimension = "channel"
62+
applicationIdSuffix = ".google.play"
63+
}
64+
}
65+
signingConfigs {
66+
create("release") {
67+
keyAlias = keyProps["keyAlias"] as String?
68+
keyPassword = keyProps["keyPassword"] as String?
69+
storeFile = keyProps["storeFile"]?.let { file(it as String) }
70+
storePassword = keyProps["storePassword"] as String?
71+
}
72+
}
73+
lint {
74+
disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))
75+
}
76+
buildTypes {
77+
getByName("release") {
78+
isMinifyEnabled = true
79+
isShrinkResources = true
80+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
81+
signingConfig = signingConfigs.getByName("release")
82+
}
83+
}
84+
applicationVariants.all {
85+
outputs.all {
86+
(this as com.android.build.gradle.internal.api.BaseVariantOutputImpl).outputFileName = "ReadYou-${defaultConfig.versionName}-${gitCommitHash}.apk"
87+
}
88+
}
89+
kotlinOptions {
90+
freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
91+
jvmTarget = JavaVersion.VERSION_11.toString()
92+
}
93+
compileOptions {
94+
sourceCompatibility = JavaVersion.VERSION_11
95+
targetCompatibility = JavaVersion.VERSION_11
96+
}
97+
buildFeatures {
98+
compose = true
99+
buildConfig = true
100+
}
101+
composeOptions {
102+
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
103+
}
104+
packaging {
105+
resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
106+
}
107+
androidResources {
108+
generateLocaleConfig = true
109+
}
110+
namespace = "me.ash.reader"
111+
}
112+
113+
dependencies {
114+
// AboutLibraries
115+
implementation(libs.aboutlibraries.core)
116+
implementation(libs.aboutlibraries.compose)
117+
118+
// Compose
119+
implementation(libs.compose.html)
120+
implementation(platform(libs.compose.bom))
121+
androidTestImplementation(platform(libs.compose.bom))
122+
implementation(libs.compose.animation.graphics)
123+
implementation(libs.compose.ui)
124+
implementation(libs.compose.ui.util)
125+
implementation(libs.compose.material)
126+
implementation(libs.compose.material.icons.extended)
127+
implementation(libs.compose.ui.tooling)
128+
implementation(libs.compose.ui.tooling.preview)
129+
androidTestImplementation(libs.compose.ui.test.junit4)
130+
implementation(libs.compose.material3)
131+
132+
// Accompanist
133+
implementation(libs.accompanist.pager)
134+
implementation(libs.accompanist.flowlayout)
135+
implementation(libs.accompanist.swiperefresh)
136+
137+
// Coil
138+
implementation(libs.coil.base)
139+
implementation(libs.coil.compose)
140+
implementation(libs.coil.svg)
141+
implementation(libs.coil.gif)
142+
143+
// Hilt
144+
implementation(libs.hilt.work)
145+
implementation(libs.hilt.android)
146+
ksp(libs.hilt.android.compiler)
147+
ksp(libs.hilt.compiler)
148+
implementation(libs.hilt.navigation.compose)
149+
150+
// AndroidX
151+
implementation(libs.android.svg)
152+
implementation(libs.opml.parser)
153+
implementation(libs.readability4j)
154+
implementation(libs.rome)
155+
implementation(libs.telephoto)
156+
implementation(libs.okhttp)
157+
implementation(libs.okhttp.coroutines)
158+
implementation(libs.retrofit)
159+
implementation(libs.retrofit.gson)
160+
implementation(libs.profileinstaller)
161+
implementation(libs.work.runtime.ktx)
162+
implementation(libs.datastore.preferences)
163+
implementation(libs.room.paging)
164+
implementation(libs.room.common)
165+
implementation(libs.room.ktx)
166+
ksp(libs.room.compiler)
167+
implementation(libs.paging.common.ktx)
168+
implementation(libs.paging.runtime.ktx)
169+
implementation(libs.paging.compose)
170+
implementation(libs.browser)
171+
implementation(libs.navigation.compose)
172+
implementation(libs.lifecycle.viewmodel.compose)
173+
implementation(libs.lifecycle.runtime.ktx)
174+
implementation(libs.core.ktx)
175+
implementation(libs.activity.compose)
176+
implementation(libs.appcompat)
177+
178+
// Testing
179+
testImplementation(libs.junit)
180+
androidTestImplementation(libs.junit.ext)
181+
androidTestImplementation(libs.espresso)
182+
testImplementation(libs.mockito.core)
183+
testImplementation(libs.mockito.junit.jupiter)
184+
testImplementation(libs.mockito.kotlin)
185+
}

‎app/src/main/java/me/ash/reader/domain/service/AbstractRssRepository.kt

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.work.ListenableWorker
88
import androidx.work.WorkManager
99
import com.rometools.rome.feed.synd.SyndFeed
1010
import kotlinx.coroutines.CoroutineDispatcher
11+
import kotlinx.coroutines.ExperimentalCoroutinesApi
1112
import kotlinx.coroutines.async
1213
import kotlinx.coroutines.awaitAll
1314
import kotlinx.coroutines.flow.Flow
@@ -274,6 +275,7 @@ abstract class AbstractRssRepository(
274275
}
275276
}
276277

278+
@OptIn(ExperimentalCoroutinesApi::class)
277279
fun pullImportant(
278280
isStarred: Boolean,
279281
isUnread: Boolean,

‎app/src/main/java/me/ash/reader/infrastructure/di/OkHttpClientModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ object UserAgentInterceptor : Interceptor {
122122
}
123123
}
124124

125-
const val USER_AGENT_STRING = "ReadYou/${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE})"
125+
const val USER_AGENT_STRING = BuildConfig.USER_AGENT_STRING

‎build.gradle

-56
This file was deleted.

‎build.gradle.kts

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
plugins {
2+
alias(libs.plugins.android.application) apply false
3+
alias(libs.plugins.android.library) apply false
4+
alias(libs.plugins.kotlin.android) apply false
5+
alias(libs.plugins.ksp) apply false
6+
alias(libs.plugins.aboutlibraries) apply false
7+
alias(libs.plugins.room) apply false
8+
alias(libs.plugins.hilt) apply false
9+
}
10+
11+
tasks.register<Delete>("clean") {
12+
delete(rootProject.layout.buildDirectory)
13+
}

‎gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
org.gradle.daemon=true
22
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC
33
org.gradle.parallel=true
4+
android.buildConfig = true
45
android.useAndroidX=true
5-
android.defaults.buildfeatures.buildconfig=true
6-
android.nonTransitiveRClass=false
7-
android.nonFinalResIds=false
6+
android.nonTransitiveRClass=true
7+
android.nonFinalResIds=true
88
android.enableR8.fullMode=false

‎gradle/libs.versions.toml

+136
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
[versions]
2+
# Android Gradle Plugin
3+
androidGradlePlugin = "8.2.1"
4+
5+
# Kotlin
6+
kotlin = "1.9.22"
7+
ksp = "1.9.22-1.0.17"
8+
9+
# AboutLibraries
10+
aboutLibsRelease = "11.1.1"
11+
12+
# Accompanist
13+
accompanist = "0.34.0"
14+
15+
# AndroidX
16+
activityCompose = "1.9.0"
17+
appcompat = "1.7.0"
18+
browser = "1.8.0"
19+
coreKtx = "1.13.1"
20+
datastore = "1.1.1"
21+
espresso = "3.5.1"
22+
lifecycle = "2.8.1"
23+
navigation = "2.7.7"
24+
paging = "3.3.0"
25+
profileinstaller = "1.3.1"
26+
room = "2.6.1"
27+
work = "2.9.0"
28+
29+
# Compose
30+
composeBom = "2024.05.00"
31+
composeCompiler = "1.5.8"
32+
composeHtml = "1.0.2"
33+
34+
# Coil
35+
coil = "2.5.0"
36+
37+
# Hilt
38+
hiltAndroid = "2.50"
39+
hiltCompiler = "1.1.0"
40+
hiltNavigationCompose = "1.1.0"
41+
hiltWork = "1.1.0"
42+
43+
# Miscellaneous Libraries
44+
androidSVG = "1.4"
45+
junit = "4.13.2"
46+
junitExt = "1.1.5"
47+
mockitoCore = "5.11.0"
48+
mockitoJUnitJupiter = "5.11.0"
49+
mockitoKotlin = "5.2.1"
50+
okhttp = "5.0.0-alpha.12"
51+
opmlParser = "3.1.0"
52+
readability4j = "1.0.8"
53+
retrofit2 = "2.9.0"
54+
rome = "1.18.0"
55+
telephoto = "0.7.1"
56+
57+
[libraries]
58+
# AboutLibraries
59+
aboutlibraries-core = { group = "com.mikepenz", name = "aboutlibraries-core", version.ref = "aboutLibsRelease" }
60+
aboutlibraries-compose = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "aboutLibsRelease" }
61+
62+
# Compose
63+
compose-html = { group = "com.github.ireward", name = "compose-html", version.ref = "composeHtml" }
64+
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
65+
compose-animation-graphics = { group = "androidx.compose.animation", name = "animation-graphics" }
66+
compose-ui = { group = "androidx.compose.ui", name = "ui" }
67+
compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
68+
compose-material = { group = "androidx.compose.material", name = "material" }
69+
compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
70+
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
71+
compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
72+
compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
73+
compose-material3 = { group = "androidx.compose.material3", name = "material3" }
74+
75+
# Accompanist
76+
accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
77+
accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" }
78+
accompanist-swiperefresh = { group = "com.google.accompanist", name = "accompanist-swiperefresh", version.ref = "accompanist" }
79+
80+
# Coil
81+
coil-base = { group = "io.coil-kt", name = "coil-base", version.ref = "coil" }
82+
coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
83+
coil-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" }
84+
coil-gif = { group = "io.coil-kt", name = "coil-gif", version.ref = "coil" }
85+
86+
# Hilt
87+
hilt-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltWork" }
88+
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hiltAndroid" }
89+
hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hiltAndroid" }
90+
hilt-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltCompiler" }
91+
hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
92+
93+
# AndroidX
94+
android-svg = { group = "com.caverock", name = "androidsvg-aar", version.ref = "androidSVG" }
95+
opml-parser = { group = "be.ceau", name = "opml-parser", version.ref = "opmlParser" }
96+
readability4j = { group = "net.dankito.readability4j", name = "readability4j", version.ref = "readability4j" }
97+
rome = { group = "com.rometools", name = "rome", version.ref = "rome" }
98+
telephoto = { group = "me.saket.telephoto", name = "zoomable", version.ref = "telephoto" }
99+
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
100+
okhttp-coroutines = { group = "com.squareup.okhttp3", name = "okhttp-coroutines-jvm", version.ref = "okhttp" }
101+
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit2" }
102+
retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit2" }
103+
profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "profileinstaller" }
104+
work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" }
105+
datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" }
106+
room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room" }
107+
room-common = { group = "androidx.room", name = "room-common", version.ref = "room" }
108+
room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
109+
room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
110+
paging-common-ktx = { group = "androidx.paging", name = "paging-common-ktx", version.ref = "paging" }
111+
paging-runtime-ktx = { group = "androidx.paging", name = "paging-runtime-ktx", version.ref = "paging" }
112+
paging-compose = { group = "androidx.paging", name = "paging-compose", version.ref = "paging" }
113+
browser = { group = "androidx.browser", name = "browser", version.ref = "browser" }
114+
navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
115+
lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
116+
lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
117+
core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
118+
activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
119+
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
120+
121+
# Testing
122+
junit = { group = "junit", name = "junit", version.ref = "junit" }
123+
junit-ext = { group = "androidx.test.ext", name = "junit", version.ref = "junitExt" }
124+
espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
125+
mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockitoCore" }
126+
mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockitoJUnitJupiter" }
127+
mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockitoKotlin" }
128+
129+
[plugins]
130+
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
131+
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
132+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
133+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
134+
aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibsRelease" }
135+
room = { id = "androidx.room", version.ref = "room" }
136+
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" }

‎settings.gradle ‎settings.gradle.kts

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ pluginManagement {
55
mavenCentral()
66
}
77
}
8+
89
dependencyResolutionManagement {
910
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1011
repositories {
1112
google()
1213
mavenCentral()
13-
maven { url 'https://jitpack.io' }
14+
maven { url = uri("https://jitpack.io") }
1415
}
1516
}
17+
1618
rootProject.name = "Reader"
17-
include ':app'
19+
include(":app")

0 commit comments

Comments
 (0)
Please sign in to comment.