Skip to content

Commit 5f4b8b2

Browse files
committed
chore: update dependencies and target api 34
1 parent 438db8e commit 5f4b8b2

File tree

6 files changed

+55
-67
lines changed

6 files changed

+55
-67
lines changed

app/build.gradle

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
id 'com.google.firebase.crashlytics'
66
id 'com.google.firebase.firebase-perf'
77
id "com.google.gms.google-services"
8-
id 'kotlin-kapt'
8+
id 'com.google.devtools.ksp'
99
}
1010

1111
def versionPropertiesFile = rootProject.file("version.properties")
1212

13-
task bumpVersionCode {
13+
tasks.register('bumpVersionCode') {
1414
doLast {
1515
def versionProperties = new Properties()
1616
versionProperties.load(new FileInputStream(versionPropertiesFile))
@@ -22,7 +22,7 @@ task bumpVersionCode {
2222
}
2323
}
2424

25-
task printVersionName {
25+
tasks.register('printVersionName') {
2626
doLast {
2727
println android.defaultConfig.versionName
2828
}
@@ -35,14 +35,12 @@ android {
3535
versionProperties.load(new FileInputStream(versionPropertiesFile))
3636
}
3737

38-
compileSdkVersion 33
39-
buildToolsVersion '33.0.2'
40-
4138
namespace 'com.gigaworks.tech.calculator'
4239
defaultConfig {
4340
applicationId "com.gigaworks.tech.calculator"
4441
minSdkVersion 21
45-
targetSdkVersion 33
42+
compileSdk 34
43+
targetSdkVersion 34
4644
versionCode versionProperties['VERSION_CODE'].toInteger()
4745
versionName "2.2.0"
4846
buildConfigField "java.util.Date", "buildTime", "new java.util.Date(" + System.currentTimeMillis() + "L)"
@@ -69,23 +67,17 @@ android {
6967
enableAggregatingTask = true
7068
}
7169

72-
configurations.all {
73-
exclude group: 'com.google.android.gms', module: 'play-services-ads'
74-
exclude group: 'com.google.android.gms', module: 'play-services-ads-identifier'
75-
exclude group: 'com.google.android.gms', module: 'play-services-ads-lite'
76-
}
77-
7870
}
7971

8072
dependencies {
8173

82-
implementation 'androidx.core:core-ktx:1.10.0'
74+
implementation 'androidx.core:core-ktx:1.12.0'
8375
implementation 'androidx.appcompat:appcompat:1.6.1'
84-
implementation 'com.google.android.material:material:1.9.0'
76+
implementation 'com.google.android.material:material:1.11.0'
8577
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
8678

8779
// navigation
88-
def navVersion = "2.5.3"
80+
def navVersion = "2.7.6"
8981
implementation "androidx.navigation:navigation-fragment-ktx:$navVersion"
9082
implementation "androidx.navigation:navigation-ui-ktx:$navVersion"
9183

@@ -95,13 +87,13 @@ dependencies {
9587

9688
// Hilt dependencies
9789
implementation "com.google.dagger:hilt-android:$hilt_version"
98-
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
90+
ksp "com.google.dagger:hilt-android-compiler:$hilt_version"
9991

10092
// ktx extensions
101-
implementation 'androidx.activity:activity-ktx:1.7.1'
93+
implementation 'androidx.activity:activity-ktx:1.8.2'
10294

10395
// viewModel
104-
def viewModelVersion = "2.6.1"
96+
def viewModelVersion = "2.6.2"
10597
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$viewModelVersion"
10698
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$viewModelVersion"
10799

@@ -110,19 +102,19 @@ dependencies {
110102
implementation "com.getkeepsafe.taptargetview:taptargetview:$tapTargetVersion"
111103

112104
// custom tabs
113-
implementation "androidx.browser:browser:1.5.0"
105+
implementation "androidx.browser:browser:1.7.0"
114106

115107
// firebase
116-
implementation platform('com.google.firebase:firebase-bom:32.0.0')
108+
implementation platform('com.google.firebase:firebase-bom:32.7.0')
117109
implementation 'com.google.firebase:firebase-crashlytics-ktx'
118110
implementation 'com.google.firebase:firebase-analytics-ktx'
119111
implementation 'com.google.firebase:firebase-perf-ktx'
120112

121113
// room
122-
def roomVersion = "2.5.1"
114+
def roomVersion = "2.6.1"
123115
implementation "androidx.room:room-runtime:$roomVersion"
124116
implementation "androidx.room:room-ktx:$roomVersion"
125-
kapt "androidx.room:room-compiler:$roomVersion"
117+
ksp "androidx.room:room-compiler:$roomVersion"
126118

127119
// google play core
128120
implementation("com.google.android.play:core:1.10.3")

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33

44
<uses-permission android:name="android.permission.INTERNET" />
55

6-
<meta-data
7-
android:name="google_analytics_adid_collection_enabled"
8-
android:value="false" />
9-
<meta-data
10-
android:name="google_analytics_default_allow_ad_personalization_signals"
11-
android:value="false" />
12-
136
<queries>
147
<intent>
158
<action android:name="android.intent.action.SENDTO" />

app/src/main/res/layout/activity_settings.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@
130130
android:layout_marginEnd="@dimen/space_l"
131131
android:gravity="top"
132132
android:paddingTop="2dp"
133-
tools:text="International"
134133
android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
135134
android:textColor="?attr/textDisable"
136135
app:layout_constraintBottom_toBottomOf="parent"
137136
app:layout_constraintEnd_toEndOf="parent"
138137
app:layout_constraintStart_toStartOf="parent"
139-
app:layout_constraintTop_toBottomOf="@+id/numberSeparator" />
138+
app:layout_constraintTop_toBottomOf="@+id/numberSeparator"
139+
tools:text="International" />
140140

141141
</androidx.constraintlayout.widget.ConstraintLayout>
142142

@@ -171,13 +171,13 @@
171171
android:layout_marginEnd="@dimen/space_l"
172172
android:gravity="top"
173173
android:paddingTop="2dp"
174-
tools:text="Precision: 6"
175174
android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
176175
android:textColor="?attr/textDisable"
177176
app:layout_constraintBottom_toBottomOf="parent"
178177
app:layout_constraintEnd_toEndOf="parent"
179178
app:layout_constraintStart_toStartOf="parent"
180-
app:layout_constraintTop_toBottomOf="@+id/precision" />
179+
app:layout_constraintTop_toBottomOf="@+id/precision"
180+
tools:text="Precision: 6" />
181181

182182
</androidx.constraintlayout.widget.ConstraintLayout>
183183

@@ -248,12 +248,12 @@
248248
android:layout_width="24dp"
249249
android:layout_height="24dp"
250250
android:layout_marginStart="@dimen/space_l"
251+
android:contentDescription="@string/theme"
251252
android:src="@drawable/brightness"
252253
app:layout_constraintBottom_toBottomOf="parent"
253254
app:layout_constraintStart_toStartOf="parent"
254255
app:layout_constraintTop_toTopOf="parent"
255-
app:tint="?attr/textPrimary"
256-
android:contentDescription="@string/theme" />
256+
app:tint="?attr/textPrimary" />
257257

258258
<TextView
259259
android:id="@+id/theme"
@@ -301,12 +301,12 @@
301301
android:layout_width="24dp"
302302
android:layout_height="24dp"
303303
android:layout_marginStart="@dimen/space_l"
304+
android:contentDescription="@string/accent_color"
304305
android:src="@drawable/palette"
305306
app:layout_constraintBottom_toBottomOf="parent"
306307
app:layout_constraintStart_toStartOf="parent"
307308
app:layout_constraintTop_toTopOf="parent"
308-
app:tint="?attr/textPrimary"
309-
android:contentDescription="@string/accent_color" />
309+
app:tint="?attr/textPrimary" />
310310

311311
<TextView
312312
android:id="@+id/color"
@@ -331,13 +331,13 @@
331331
android:layout_marginEnd="@dimen/space_l"
332332
android:gravity="top"
333333
android:paddingTop="2dp"
334-
tools:text="Blue"
335334
android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
336335
android:textColor="?attr/textDisable"
337336
app:layout_constraintBottom_toBottomOf="parent"
338337
app:layout_constraintEnd_toEndOf="parent"
339338
app:layout_constraintStart_toEndOf="@+id/colorIcon"
340-
app:layout_constraintTop_toBottomOf="@+id/color" />
339+
app:layout_constraintTop_toBottomOf="@+id/color"
340+
tools:text="Blue" />
341341

342342
</androidx.constraintlayout.widget.ConstraintLayout>
343343

@@ -367,12 +367,12 @@
367367
android:layout_width="24dp"
368368
android:layout_height="24dp"
369369
android:layout_marginStart="@dimen/space_l"
370+
android:contentDescription="@string/share"
370371
android:src="@drawable/share"
371372
app:layout_constraintBottom_toBottomOf="parent"
372373
app:layout_constraintStart_toStartOf="parent"
373374
app:layout_constraintTop_toTopOf="parent"
374-
app:tint="?attr/textPrimary"
375-
android:contentDescription="@string/share" />
375+
app:tint="?attr/textPrimary" />
376376

377377
<TextView
378378
android:id="@+id/share"
@@ -420,12 +420,12 @@
420420
android:layout_width="24dp"
421421
android:layout_height="24dp"
422422
android:layout_marginStart="@dimen/space_l"
423+
android:contentDescription="@string/rate"
423424
android:src="@drawable/star"
424425
app:layout_constraintBottom_toBottomOf="parent"
425426
app:layout_constraintStart_toStartOf="parent"
426427
app:layout_constraintTop_toTopOf="parent"
427-
app:tint="?attr/textPrimary"
428-
android:contentDescription="@string/rate" />
428+
app:tint="?attr/textPrimary" />
429429

430430
<TextView
431431
android:id="@+id/rate"
@@ -473,12 +473,12 @@
473473
android:layout_width="24dp"
474474
android:layout_height="24dp"
475475
android:layout_marginStart="@dimen/space_l"
476+
android:contentDescription="@string/bug"
476477
android:src="@drawable/bug"
477478
app:layout_constraintBottom_toBottomOf="parent"
478479
app:layout_constraintStart_toStartOf="parent"
479480
app:layout_constraintTop_toTopOf="parent"
480-
app:tint="?attr/textPrimary"
481-
android:contentDescription="@string/bug" />
481+
app:tint="?attr/textPrimary" />
482482

483483
<TextView
484484
android:id="@+id/bug"
@@ -526,12 +526,12 @@
526526
android:layout_width="24dp"
527527
android:layout_height="24dp"
528528
android:layout_marginStart="@dimen/space_l"
529+
android:contentDescription="@string/contact"
529530
android:src="@drawable/mail"
530531
app:layout_constraintBottom_toBottomOf="parent"
531532
app:layout_constraintStart_toStartOf="parent"
532533
app:layout_constraintTop_toTopOf="parent"
533-
app:tint="?attr/textPrimary"
534-
android:contentDescription="@string/contact" />
534+
app:tint="?attr/textPrimary" />
535535

536536
<TextView
537537
android:id="@+id/contact"
@@ -579,12 +579,12 @@
579579
android:layout_width="24dp"
580580
android:layout_height="24dp"
581581
android:layout_marginStart="@dimen/space_l"
582+
android:contentDescription="@string/follow"
582583
android:src="@drawable/twitter"
583584
app:layout_constraintBottom_toBottomOf="parent"
584585
app:layout_constraintStart_toStartOf="parent"
585586
app:layout_constraintTop_toTopOf="parent"
586-
app:tint="?attr/textPrimary"
587-
android:contentDescription="@string/follow" />
587+
app:tint="?attr/textPrimary" />
588588

589589
<TextView
590590
android:id="@+id/follow"
@@ -632,12 +632,12 @@
632632
android:layout_width="24dp"
633633
android:layout_height="24dp"
634634
android:layout_marginStart="@dimen/space_l"
635+
android:contentDescription="@string/title_activity_about"
635636
android:src="@drawable/alert_circle"
636637
app:layout_constraintBottom_toBottomOf="parent"
637638
app:layout_constraintStart_toStartOf="parent"
638639
app:layout_constraintTop_toTopOf="parent"
639-
app:tint="?attr/textPrimary"
640-
android:contentDescription="@string/title_activity_about" />
640+
app:tint="?attr/textPrimary" />
641641

642642
<TextView
643643
android:id="@+id/about"
@@ -662,13 +662,13 @@
662662
android:layout_marginEnd="@dimen/space_l"
663663
android:gravity="top"
664664
android:paddingTop="2dp"
665-
tools:text="Version: 2.0.0"
666665
android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
667666
android:textColor="?attr/textDisable"
668667
app:layout_constraintBottom_toBottomOf="parent"
669668
app:layout_constraintEnd_toEndOf="parent"
670669
app:layout_constraintStart_toEndOf="@+id/aboutIcon"
671-
app:layout_constraintTop_toBottomOf="@+id/about" />
670+
app:layout_constraintTop_toBottomOf="@+id/about"
671+
tools:text="Version: 2.0.0" />
672672

673673
</androidx.constraintlayout.widget.ConstraintLayout>
674674
</LinearLayout>

app/src/main/res/layout/fragment_about.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
android:layout_width="match_parent"
7676
android:layout_height="56dp"
7777
android:layout_marginTop="@dimen/space_xl"
78-
app:cardElevation="4dp"
7978
android:visibility="gone"
8079
android:background="?attr/selectableItemBackground"
8180
android:clickable="true"
@@ -118,9 +117,9 @@
118117
<com.google.android.material.card.MaterialCardView
119118
android:layout_width="match_parent"
120119
android:layout_height="56dp"
121-
app:cardElevation="4dp"
122120
android:layout_marginTop="@dimen/space_xl"
123121
android:background="?attr/selectableItemBackground"
122+
app:cardCornerRadius="0dp"
124123
android:clickable="true"
125124
android:focusable="true">
126125

@@ -161,8 +160,8 @@
161160
<com.google.android.material.card.MaterialCardView
162161
android:layout_width="match_parent"
163162
android:layout_height="56dp"
164-
app:cardElevation="4dp"
165163
android:background="?attr/selectableItemBackground"
164+
app:cardCornerRadius="0dp"
166165
android:clickable="true"
167166
android:focusable="true">
168167

@@ -203,8 +202,8 @@
203202
<com.google.android.material.card.MaterialCardView
204203
android:layout_width="match_parent"
205204
android:layout_height="56dp"
206-
app:cardElevation="4dp"
207205
android:background="?attr/selectableItemBackground"
206+
app:cardCornerRadius="0dp"
208207
android:clickable="true"
209208
android:focusable="true">
210209

@@ -246,8 +245,8 @@
246245
android:layout_width="match_parent"
247246
android:layout_height="56dp"
248247
android:layout_marginBottom="@dimen/space_xl"
249-
app:cardElevation="4dp"
250248
android:background="?attr/selectableItemBackground"
249+
app:cardCornerRadius="0dp"
251250
android:clickable="true"
252251
android:focusable="true">
253252

build.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.8.10'
4-
ext.hilt_version = '2.45'
3+
ext.kotlin_version = '1.9.20'
4+
ext.hilt_version = '2.49'
55
repositories {
66
google()
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.0.1'
10+
classpath 'com.android.tools.build:gradle:8.2.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
13-
classpath 'com.google.gms:google-services:4.3.15'
14-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
13+
classpath 'com.google.gms:google-services:4.4.0'
14+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
1515
classpath 'com.google.firebase:perf-plugin:1.4.2'
1616

1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files
1919
}
2020
}
2121

22+
plugins {
23+
id 'com.google.devtools.ksp' version '1.9.20-1.0.14' apply false
24+
}
25+
2226
allprojects {
2327
repositories {
2428
google()
2529
mavenCentral()
2630
}
2731
}
2832

29-
task clean(type: Delete) {
33+
tasks.register('clean', Delete) {
3034
delete rootProject.buildDir
3135
}

0 commit comments

Comments
 (0)