Skip to content

Commit 172185b

Browse files
committed
Improvements and bug fixes:
- Resolved application build issue occurring due to tickseekbar library which is used for slider component. - Updated Gradle version. - Updated Kotlin plugin and Java version. - Added file to maintain versions of all dependencies used in application. Closes #46
1 parent d1a4a67 commit 172185b

6 files changed

+196
-66
lines changed

app/build.gradle

+66-58
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,18 @@ android {
155155
buildConfigField "String", "USER_POOL", '"' + userPool + '"'
156156
}
157157

158+
compileOptions {
159+
sourceCompatibility JavaVersion.VERSION_17
160+
targetCompatibility JavaVersion.VERSION_17
161+
}
162+
163+
kotlinOptions {
164+
jvmTarget = '17'
165+
}
166+
158167
buildFeatures {
159168
viewBinding true
169+
buildConfig = true
160170
}
161171

162172
buildTypes {
@@ -201,76 +211,74 @@ dependencies {
201211

202212
// Native libs
203213
implementation fileTree(dir: "third_party/connectedhomeip/libs", include: ["*.jar", "*.so"])
214+
implementation fileTree(dir: "src/main/libs", include: ["*.aar"])
215+
implementation fileTree(include: ['*.jar'], dir: 'libs')
216+
217+
implementation libs.appcompat
218+
implementation libs.constraintlayout
219+
implementation libs.recyclerview
220+
implementation libs.swiperefreshlayout
221+
implementation libs.browser
222+
implementation libs.core.ktx
223+
implementation libs.work.runtime
224+
225+
implementation libs.rxandroid
226+
implementation libs.adapter.rxjava2
227+
implementation libs.retrofit
228+
implementation libs.converter.gson
229+
implementation libs.logging.interceptor
230+
implementation libs.gson
231+
232+
implementation libs.material
233+
implementation libs.tink.android
234+
implementation libs.protobuf.javalite
235+
236+
implementation libs.kotlinx.coroutines.android
237+
implementation libs.kotlinx.coroutines.core
238+
implementation libs.kotlinx.coroutines.rx2
239+
implementation libs.kotlinx.coroutines.jdk8
240+
241+
// Firebase
242+
implementation platform(libs.firebase.bom)
243+
implementation libs.firebase.messaging
244+
implementation libs.firebase.analytics
245+
implementation libs.firebase.crashlytics
246+
implementation libs.play.services.gcm
204247

205248
// Connected Home
206-
implementation "com.google.android.gms:play-services-base:18.2.0"
207-
implementation "com.google.android.gms:play-services-home:16.0.0"
208-
implementation 'com.google.android.gms:play-services-threadnetwork:16.0.0'
249+
implementation libs.play.services.base
250+
implementation libs.play.services.home
251+
implementation libs.play.services.threadnetwork
252+
253+
implementation libs.esp.idf.provisioning.android
254+
implementation libs.code.scanner
255+
implementation libs.mpandroidchart
256+
implementation libs.tapholdupbutton
257+
implementation libs.avloadingindicatorview
258+
implementation libs.holocolorpicker
259+
implementation libs.android.gif.drawable
260+
implementation libs.android.segmented
261+
implementation libs.eventbus
262+
implementation libs.jnanoid
263+
implementation libs.jwtdecode
264+
implementation libs.commons.codec
209265

210-
implementation fileTree(include: ['*.jar'], dir: 'libs')
211-
implementation 'androidx.appcompat:appcompat:1.3.1'
212-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
213-
implementation 'com.google.android.material:material:1.1.0'
214-
implementation 'androidx.recyclerview:recyclerview:1.2.1'
215-
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
216-
implementation "androidx.browser:browser:1.3.0"
217-
218-
implementation 'com.google.protobuf:protobuf-javalite:3.18.0'
219-
implementation 'com.google.crypto.tink:tink-android:1.6.1'
220-
221-
implementation 'org.greenrobot:eventbus:3.3.1'
222-
implementation 'com.auth0.android:jwtdecode:1.4.0'
223-
implementation 'com.google.code.gson:gson:2.9.0'
224-
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
225-
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
226-
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
227-
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
228-
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
229-
230-
implementation 'com.github.firdausmaulan:AVLoadingIndicatorView:2.3.0'
231-
implementation 'com.larswerkman:HoloColorPicker:1.5'
232-
implementation 'com.aventrix.jnanoid:jnanoid:2.0.0'
233-
implementation 'com.github.yuriy-budiyev:code-scanner:2.1.2'
234-
implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.2.1'
235-
implementation 'com.github.warkiz.tickseekbar:tickseekbar:0.1.4'
236-
implementation 'com.github.abdularis:TapHoldUpButton:0.1.2'
237-
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
238-
implementation 'info.hoang8f:android-segmented:1.0.6'
239-
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
240-
implementation 'androidx.core:core-ktx:1.8.0'
266+
//crypto
267+
implementation libs.bcpkix.jdk15to18
268+
implementation libs.bcprov.jdk15to18
269+
270+
testImplementation libs.junit
271+
androidTestImplementation libs.runner
272+
androidTestImplementation libs.espresso.core
241273

242274
// Room dependencies
243275
def room_version = "2.5.2"
244276
implementation "androidx.room:room-runtime:$room_version"
245277
kapt "androidx.room:room-compiler:$room_version"
246278

247-
def work_version = "2.7.1"
248-
implementation "androidx.work:work-runtime:$work_version"
249-
250-
// Import the BoM for the Firebase platform
251-
implementation platform('com.google.firebase:firebase-bom:30.0.0')
252-
implementation 'com.google.firebase:firebase-messaging'
253-
implementation 'com.google.firebase:firebase-analytics'
254-
implementation 'com.google.firebase:firebase-crashlytics'
255-
implementation 'com.google.android.gms:play-services-gcm:17.0.0'
256-
257-
testImplementation 'junit:junit:4.13.2'
258-
androidTestImplementation 'androidx.test:runner:1.5.2'
259-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
260-
261-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
262-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
263-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.5.2'
264-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.2'
265-
implementation 'commons-codec:commons-codec:1.16.0'
266-
267279
// Hilt
268280
// https://dagger.dev/hilt/gradle-setup
269281
implementation 'com.google.dagger:hilt-android:2.44.2'
270282
implementation 'com.google.ar:core:1.35.0'
271283
kapt 'com.google.dagger:hilt-compiler:2.44.2'
272-
273-
//crypto
274-
implementation "org.bouncycastle:bcpkix-jdk15to18:1.72"
275-
implementation 'org.bouncycastle:bcprov-jdk15to18:1.72'
276284
}
28.5 KB
Binary file not shown.

build.gradle

+9-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.3.1'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
12-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.1'
13-
classpath 'com.google.gms:google-services:4.3.15' // Google Services plugin
14-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
15-
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.42'
10+
classpath libs.gradle
11+
classpath libs.kotlin.gradle.plugin
12+
classpath libs.protobuf.gradle.plugin
13+
classpath libs.google.services // Google Services plugin
14+
classpath libs.firebase.crashlytics.gradle
15+
classpath libs.hilt.android.gradle.plugin
1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files
1818
}
@@ -25,6 +25,9 @@ allprojects {
2525
jcenter()
2626
maven { url 'https://jitpack.io' }
2727
maven { url "https://maven.google.com" }
28+
flatDir {
29+
dirs 'src/main/libs'
30+
}
2831
}
2932
}
3033

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ org.gradle.jvmargs=-Xmx1536m
1717
# This option should only be used with decoupled projects. More details, visit
1818
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1919
# org.gradle.parallel=true
20+
android.nonFinalResIds=false

gradle/libs.versions.toml

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
[versions]
2+
gradle = "8.4.2"
3+
kotlinGradlePlugin = "2.0.0"
4+
playServicesGcm = "17.0.0"
5+
protobufGradlePlugin = "0.9.1"
6+
googleServices = "4.4.2"
7+
firebaseCrashlyticsGradle = "2.9.9"
8+
hiltAndroidGradlePlugin = "2.42"
9+
10+
appcompat = "1.3.1"
11+
recyclerview = "1.2.1"
12+
constraintlayout = "2.1.0"
13+
swiperefreshlayout = "1.1.0"
14+
browser = "1.3.0"
15+
coreKtx = "1.12.0"
16+
workRuntime = "2.7.1"
17+
18+
rxandroid = "2.1.1"
19+
adapterRxjava2 = "2.5.0"
20+
retrofit = "2.9.0"
21+
loggingInterceptor = "4.9.0"
22+
gson = "2.9.0"
23+
24+
material = "1.1.0"
25+
tinkAndroid = "1.6.1"
26+
protobufJavalite = "3.18.0"
27+
kotlinxCoroutinesAndroid = "1.5.2"
28+
firebaseBom = "30.0.0"
29+
30+
playServicesBase = "18.2.0"
31+
playServicesHome = "16.0.0"
32+
33+
espIdfProvisioningAndroid = "lib-2.2.1"
34+
codeScanner = "2.1.2"
35+
mpandroidchart = "v3.1.0"
36+
tapholdupbutton = "0.1.2"
37+
avloadingindicatorview = "2.3.0"
38+
holocolorpicker = "1.5"
39+
androidGifDrawable = "1.2.25"
40+
androidSegmented = "1.0.6"
41+
eventbus = "3.3.1"
42+
jnanoid = "2.0.0"
43+
jwtdecode = "1.4.0"
44+
commonsCodec = "1.16.0"
45+
46+
bcpkixJdk15to18 = "1.72"
47+
48+
junit = "4.13.2"
49+
runner = "1.5.2"
50+
espressoCore = "3.5.1"
51+
52+
53+
[libraries]
54+
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
55+
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
56+
play-services-gcm = { module = "com.google.android.gms:play-services-gcm", version.ref = "playServicesGcm" }
57+
protobuf-gradle-plugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobufGradlePlugin" }
58+
google-services = { module = "com.google.gms:google-services", version.ref = "googleServices" }
59+
firebase-crashlytics-gradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsGradle" }
60+
hilt-android-gradle-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hiltAndroidGradlePlugin" }
61+
62+
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
63+
recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
64+
constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
65+
swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swiperefreshlayout" }
66+
browser = { group = "androidx.browser", name = "browser", version.ref = "browser" }
67+
core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
68+
work-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "workRuntime" }
69+
70+
rxandroid = { group = "io.reactivex.rxjava2", name = "rxandroid", version.ref = "rxandroid" }
71+
adapter-rxjava2 = { group = "com.squareup.retrofit2", name = "adapter-rxjava2", version.ref = "adapterRxjava2" }
72+
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
73+
converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
74+
logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "loggingInterceptor" }
75+
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
76+
77+
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
78+
tink-android = { group = "com.google.crypto.tink", name = "tink-android", version.ref = "tinkAndroid" }
79+
protobuf-javalite = { group = "com.google.protobuf", name = "protobuf-javalite", version.ref = "protobufJavalite" }
80+
81+
kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
82+
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesAndroid" }
83+
kotlinx-coroutines-jdk8 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk8", version.ref = "kotlinxCoroutinesAndroid" }
84+
kotlinx-coroutines-rx2 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-rx2", version.ref = "kotlinxCoroutinesAndroid" }
85+
86+
firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
87+
firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" }
88+
firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
89+
firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" }
90+
91+
play-services-base = { group = "com.google.android.gms", name = "play-services-base", version.ref = "playServicesBase" }
92+
play-services-home = { group = "com.google.android.gms", name = "play-services-home", version.ref = "playServicesHome" }
93+
play-services-threadnetwork = { group = "com.google.android.gms", name = "play-services-threadnetwork", version.ref = "playServicesHome" }
94+
95+
esp-idf-provisioning-android = { group = "com.github.espressif", name = "esp-idf-provisioning-android", version.ref = "espIdfProvisioningAndroid" }
96+
code-scanner = { group = "com.github.yuriy-budiyev", name = "code-scanner", version.ref = "codeScanner" }
97+
mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" }
98+
tapholdupbutton = { group = "com.github.abdularis", name = "TapHoldUpButton", version.ref = "tapholdupbutton" }
99+
avloadingindicatorview = { group = "com.github.firdausmaulan", name = "AVLoadingIndicatorView", version.ref = "avloadingindicatorview" }
100+
holocolorpicker = { group = "com.larswerkman", name = "HoloColorPicker", version.ref = "holocolorpicker" }
101+
android-gif-drawable = { group = "pl.droidsonroids.gif", name = "android-gif-drawable", version.ref = "androidGifDrawable" }
102+
android-segmented = { group = "info.hoang8f", name = "android-segmented", version.ref = "androidSegmented" }
103+
eventbus = { group = "org.greenrobot", name = "eventbus", version.ref = "eventbus" }
104+
jnanoid = { group = "com.aventrix.jnanoid", name = "jnanoid", version.ref = "jnanoid" }
105+
jwtdecode = { group = "com.auth0.android", name = "jwtdecode", version.ref = "jwtdecode" }
106+
commons-codec = { group = "commons-codec", name = "commons-codec", version.ref = "commonsCodec" }
107+
108+
bcpkix-jdk15to18 = { group = "org.bouncycastle", name = "bcpkix-jdk15to18", version.ref = "bcpkixJdk15to18" }
109+
bcprov-jdk15to18 = { group = "org.bouncycastle", name = "bcprov-jdk15to18", version.ref = "bcpkixJdk15to18" }
110+
111+
junit = { group = "junit", name = "junit", version.ref = "junit" }
112+
runner = { group = "androidx.test", name = "runner", version.ref = "runner" }
113+
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
114+
115+
[plugins]
116+
#android-application = { id = "com.android.application", version.ref = "agp" }
117+
#jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
118+
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Oct 05 11:30:17 IST 2022
1+
#Wed Sep 04 16:40:59 IST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip

0 commit comments

Comments
 (0)