Skip to content

Commit 6e03bc4

Browse files
rosuHrosuH
authored
chore(build): update dependencies and Gradle settings (#312)
- Replace plugin IDs with versions from libs.versions.toml. - Update compileSdk to 34. - Update various dependencies to their latest versions. - Modify onDraw method arguments to be non-nullable. - Refactor build scripts to align with new dependency management practices. # GENERATE BY https://aicommit.app
1 parent 9929aea commit 6e03bc4

16 files changed

Lines changed: 375 additions & 143 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 88 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import com.android.build.gradle.internal.api.BaseVariantOutputImpl
22

33
plugins {
4-
id("com.android.application")
5-
id("kotlin-android")
6-
id("kotlin-parcelize")
7-
id("org.jetbrains.kotlin.kapt")
8-
id("dagger.hilt.android.plugin")
4+
id(libs.plugins.android.application.get().pluginId)
5+
id(libs.plugins.kotlin.android.get().pluginId)
6+
id(libs.plugins.kotlin.parcelize.get().pluginId)
7+
id(libs.plugins.ksp.get().pluginId)
8+
id(libs.plugins.hilt.plugin.get().pluginId)
99
}
1010

1111
android {
@@ -15,8 +15,8 @@ android {
1515
applicationId = "me.rosuh.easywatermark"
1616
minSdk = (Apps.minSdk)
1717
targetSdk = (Apps.targetSdk)
18-
versionCode = 20809
19-
versionName = "2.8.9"
18+
versionCode = 20900
19+
versionName = "2.9.0"
2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
setProperty("archivesBaseName", "$applicationId-v$versionName($versionCode)")
2222
}
@@ -62,36 +62,48 @@ android {
6262

6363
namespace = "me.rosuh.easywatermark"
6464

65-
lint {
66-
baseline = file("lint-baseline.xml")
65+
// lint {
66+
// baseline = file("lint-baseline.xml")
67+
// quiet = true
68+
// abortOnError = false
69+
// checkReleaseBuilds = false
70+
// }
71+
72+
buildFeatures {
73+
compose = true
74+
}
75+
76+
composeOptions {
77+
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
6778
}
6879

6980
kotlin {
7081
jvmToolchain(17)
7182
}
7283
}
7384

74-
kapt {
75-
correctErrorTypes = true
76-
}
7785

7886
dependencies {
7987
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
8088
implementation(project(mapOf("path" to ":cmonet")))
8189

8290
implementation(libs.room.runtime)
8391
implementation(libs.room.ktx)
84-
kapt(libs.room.compiler)
92+
implementation(libs.core.ktx)
93+
ksp(libs.room.compiler)
8594

8695
implementation(libs.datastore.preference)
8796

88-
implementation(libs.dagger.hilt.android)
89-
kapt(libs.dagger.hilt.compiler)
97+
// di
98+
implementation(libs.hilt.android)
99+
ksp(libs.hilt.compiler)
100+
androidTestImplementation(libs.hilt.testing)
101+
kspAndroidTest(libs.hilt.compiler)
90102

91-
implementation(libs.asyncLayoutInflater)
103+
implementation(libs.asynclayout.inflater)
92104

93-
implementation(libs.glide.glide)
94-
kapt(libs.glide.compiler)
105+
implementation(libs.glide)
106+
ksp(libs.glide.compiler)
95107

96108
implementation(libs.compressor)
97109

@@ -105,13 +117,13 @@ dependencies {
105117
implementation(libs.activity.ktx)
106118
implementation(libs.lifecycle.runtime.ktx)
107119
implementation(libs.lifecycle.livedata.ktx)
108-
implementation(libs.lifecycle.viewModel.ktx)
120+
implementation(libs.lifecycle.viewmodel.ktx)
109121
implementation(libs.viewpager2)
110122
implementation(libs.recyclerview)
111-
implementation(libs.constraintLayout)
112-
implementation(libs.exifInterface)
123+
implementation(libs.constraintlayout)
124+
implementation(libs.exifinterface)
113125
implementation(libs.palette.ktx)
114-
implementation(libs.profieinstaller)
126+
implementation(libs.profileinstaller)
115127

116128
implementation(libs.colorpicker)
117129

@@ -126,4 +138,58 @@ dependencies {
126138
androidTestImplementation(libs.test.espresso.core)
127139
androidTestImplementation(libs.test.uiautomator)
128140
androidTestImplementation(libs.test.ext.junit)
141+
142+
// or only import the main APIs for the underlying toolkit systems,
143+
// such as input and measurement/layout
144+
// val composeBom = platform("androidx.compose:compose-bom:2023.10.00")
145+
// implementation(composeBom)
146+
// androidTestImplementation(composeBom)
147+
implementation(platform(libs.androidx.compose.bom))
148+
androidTestImplementation(platform(libs.androidx.compose.bom))
149+
// implementation("androidx.compose.material3:material3:1.2.0-alpha09")
150+
// implementation("androidx.compose.material3:material3-window-size-class:1.1.2")
151+
// implementation(libs.material)
152+
implementation(libs.androidx.compose.material3)
153+
implementation(libs.androidx.compose.material3.windowSizeClass)
154+
// implementation("androidx.compose.ui:ui")
155+
implementation(libs.androidx.compose.ui.ui)
156+
157+
// implementation("androidx.compose.ui:ui-tooling-preview")
158+
// debugImplementation("androidx.compose.ui:ui-tooling")
159+
implementation(libs.androidx.compose.ui.tooling.preview)
160+
implementation(libs.androidx.compose.ui.tooling)
161+
162+
// Optional - Integration with activities
163+
// implementation("androidx.activity:activity-compose:1.8.0")
164+
implementation(libs.androidx.activity.compose)
165+
// Optional - Integration with ViewModels
166+
// implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
167+
implementation(libs.androidx.compose.lifecycle.viewmodel)
168+
169+
// When using a MDC theme
170+
// implementation("com.google.android.material:compose-theme-adapter:1.2.1")
171+
172+
// implementation("com.google.accompanist:accompanist-permissions:0.33.2-alpha")
173+
implementation(libs.accompanist.permissions)
174+
// implementation("io.coil-kt:coil-compose:2.3.0")
175+
implementation(libs.coil.kt)
176+
implementation(libs.coil.kt.compose)
177+
implementation(libs.coil.kt.svg)
178+
179+
// implementation("androidx.compose.runtime:runtime-livedata:1.5.3")
180+
implementation(libs.androidx.compose.runtime.livedata)
181+
182+
// implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2")
183+
implementation(libs.androidx.lifecycle.runtime.compose)
184+
185+
// implementation("androidx.navigation:navigation-compose:2.7.4")
186+
implementation(libs.androidx.navigation.compose)
187+
188+
// implementation("com.google.accompanist:accompanist-navigation-animation:0.31.1-alpha")
189+
implementation(libs.accompanist.navigation.animation)
190+
191+
// implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
192+
implementation(libs.androidx.constraintlayout.compose)
193+
implementation(libs.androidx.motionlayoout.compose)
194+
129195
}

‎app/src/main/java/me/rosuh/easywatermark/ui/widget/CircleImageView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CircleImageView : AppCompatImageView {
6060
}
6161

6262
@SuppressLint("DrawAllocation")
63-
override fun onDraw(canvas: Canvas?) {
63+
override fun onDraw(canvas: Canvas) {
6464
if (sourceImageBitmap == null || (sizeHasChanged && width > 0 && height > 0)) {
6565
super.onDraw(canvas)
6666
sourceImageBitmap = drawable.toBitmap(width, height)

‎app/src/main/java/me/rosuh/easywatermark/ui/widget/ColoredImageVIew.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class ColoredImageVIew : AppCompatImageView {
8383
}
8484

8585
@SuppressLint("DrawAllocation")
86-
override fun onDraw(canvas: Canvas?) {
86+
override fun onDraw(canvas: Canvas) {
8787
if (innerBitmap == null || (sizeHasChanged && width > 0 && height > 0)) {
8888
super.onDraw(canvas)
8989
}

‎app/src/main/java/me/rosuh/easywatermark/ui/widget/ProgressImageView.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,10 @@ class ProgressImageView : AppCompatImageView {
6161
private val saveLayerBounds = RectF()
6262

6363
@SuppressLint("DrawAllocation")
64-
override fun onDraw(canvas: Canvas?) {
64+
override fun onDraw(canvas: Canvas) {
6565
super.onDraw(canvas)
66-
if (measuredWidth < 0 || measuredHeight <= 0 || drawable == null
67-
|| drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0 || canvas == null
68-
|| curX <= 0f || !enableProgress.get()
66+
if ((measuredWidth < 0 || measuredHeight <= 0 || drawable == null
67+
|| drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0) || curX <= 0f || !enableProgress.get()
6968
) {
7069
return
7170
}

‎app/src/main/java/me/rosuh/easywatermark/ui/widget/RadioButton.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class RadioButton : View {
7272
return ContextCompat.getDrawable(context, iconRes) ?: ColorDrawable(context.colorOnSurface)
7373
}
7474

75-
override fun onDraw(canvas: Canvas?) {
75+
override fun onDraw(canvas: Canvas) {
7676
// draw background
7777
paint.style = Paint.Style.FILL
7878
paint.color = if (isChecked) bgColorSelected else bgColorNormal

‎app/src/main/java/me/rosuh/easywatermark/ui/widget/SelectableImageView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class SelectableImageView : View {
111111
invalidate()
112112
}
113113

114-
override fun onDraw(canvas: Canvas?) {
114+
override fun onDraw(canvas: Canvas) {
115115
super.onDraw(canvas)
116116
if (isSelected) {
117117
canvas?.drawCircle(

‎app/src/main/java/me/rosuh/easywatermark/ui/widget/TouchSensitiveRv.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,16 @@ class TouchSensitiveRv : RecyclerView {
196196
borderAnimator.cancel()
197197
}
198198

199-
override fun onDraw(c: Canvas?) {
199+
override fun onDraw(c: Canvas) {
200200
super.onDraw(c)
201-
c?.withSave {
201+
c.withSave {
202202
drawRect(
203203
glowRectF,
204204
glowPaint
205205
)
206206
}
207207
if (enableBorder && scrollState == SCROLL_STATE_IDLE) {
208-
c?.drawRoundRect(borderRectF, 2F.dp, 2F.dp, borderPaint)
208+
c.drawRoundRect(borderRectF, 2F.dp, 2F.dp, borderPaint)
209209
}
210210
}
211211

‎app/src/main/java/me/rosuh/easywatermark/ui/widget/WaterMarkImageView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ class WaterMarkImageView : androidx.appcompat.widget.AppCompatImageView, Corouti
280280
Log.i("onSizeChanged", "$w, $h, $oldh, $oldh")
281281
}
282282

283-
override fun onDraw(canvas: Canvas?) {
283+
override fun onDraw(canvas: Canvas) {
284284
super.onDraw(canvas)
285285
if (config?.text.isNullOrEmpty()
286286
|| decodedUri.toString().isEmpty()

‎app/src/main/res/drawable-xxhdpi/bg_avatar_dev.webp‎

-8.06 KB
Loading

‎baseBenchmarks/build.gradle.kts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
plugins {
2-
id("com.android.library")
3-
id("kotlin-android")
2+
id(libs.plugins.android.library.get().pluginId)
3+
id(libs.plugins.kotlin.android.get().pluginId)
4+
id(libs.plugins.ksp.get().pluginId)
45
}
56

67
android {
78
namespace = "me.rosuh.benchmark.macro.base"
8-
compileSdk = 33
9+
compileSdk = 34
910

1011
defaultConfig {
1112
minSdk = Apps.minSdk
@@ -29,4 +30,6 @@ android {
2930
}
3031
}
3132

32-
dependencies {}
33+
dependencies {
34+
implementation(libs.core.ktx)
35+
}

0 commit comments

Comments
 (0)