Skip to content

Commit 5f43145

Browse files
idormencoaniri
andauthored
Add municipality dropdown (#265)
* Add municiplality dropdown * attempt to add new dropdown in polling station details screen * small issues fixed, added polish language * Update Repository.kt * small renames * rework selections and new questions * fix bug * upgrade project * fix bugs ,fix translations * remove validation fix powiat gmina issue --------- Co-authored-by: Irina Borozan <anirib@gmail.com>
1 parent 306dce6 commit 5f43145

File tree

63 files changed

+3115
-654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3115
-654
lines changed

app/build.gradle

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ androidExtensions {
1717
}
1818

1919
android {
20-
compileSdkVersion 29
21-
buildToolsVersion = '29.0.3'
20+
compileSdkVersion 33
21+
buildToolsVersion = '30.0.3'
2222

2323
defaultConfig {
2424
applicationId "ro.code4.monitorizarevot"
2525
minSdkVersion 21
26-
targetSdkVersion 29
26+
targetSdkVersion 33
2727
versionCode 42
2828
versionName "2.1.1"
2929
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
30+
multiDexEnabled true
3031

3132
javaCompileOptions {
3233
annotationProcessorOptions {
@@ -89,12 +90,12 @@ android {
8990
}
9091

9192
compileOptions {
92-
sourceCompatibility JavaVersion.VERSION_1_8
93-
targetCompatibility JavaVersion.VERSION_1_8
93+
sourceCompatibility JavaVersion.VERSION_11
94+
targetCompatibility JavaVersion.VERSION_11
9495
}
9596

9697
kotlinOptions {
97-
jvmTarget = "1.8"
98+
jvmTarget = "11"
9899
}
99100
}
100101

@@ -103,7 +104,7 @@ ext {
103104
navigationVersion = "2.2.2"
104105
koinVersion = '2.0.1'
105106
parcelerVersion = "1.1.13"
106-
roomVersion = '2.2.5'
107+
roomVersion = '2.4.3'
107108
firebaseAnalyticsVersion = '17.4.3'
108109
firebaseCrashlyticsVersion = '17.1.0'
109110
firebaseMessagingVersion = "20.2.0"
@@ -157,12 +158,21 @@ dependencies {
157158
implementation "androidx.room:room-rxjava2:$roomVersion"
158159
implementation 'com.squareup.picasso:picasso:2.71828'
159160

161+
implementation 'com.github.fondesa:kpermissions:3.4.0'
162+
160163
// Unit tests
161164
testImplementation 'junit:junit:4.13'
162165
// Instrumented tests
163166
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
164167
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
165168
androidTestImplementation "androidx.room:room-testing:$roomVersion"
169+
implementation "androidx.activity:activity-ktx:1.7.2"
170+
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
171+
configurations {
172+
all {
173+
exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
174+
}
175+
}
166176
}
167177

168178
sonarqube {

0 commit comments

Comments
 (0)