fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update Commons with joda proguard rules

This commit is contained in:
tibbi 2017-12-31 12:20:17 +01:00
parent fdaf5e9b2c
commit 72f71b9158
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -42,7 +42,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.4.12' implementation 'com.simplemobiletools:commons:3.5.4'
implementation 'joda-time:joda-time:2.9.9' implementation 'joda-time:joda-time:2.9.9'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:multidex:1.0.2' implementation 'com.android.support:multidex:1.0.2'

6
app/proguard-rules.pro vendored
View File

@ -1,7 +1 @@
-keep class com.simplemobiletools.calendar.models.** { *; } -keep class com.simplemobiletools.calendar.models.** { *; }
# Joda
-dontwarn org.joda.convert.**
-dontwarn org.joda.time.**
-keep class org.joda.time.** { *; }
-keep interface org.joda.time.** { *; }

3
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt
View File

@ -107,8 +107,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, v
DeleteEventDialog(activity, eventIds) { DeleteEventDialog(activity, eventIds) {
val eventsToDelete = ArrayList<Event>(selectedPositions.size) val eventsToDelete = ArrayList<Event>(selectedPositions.size)
selectedPositions.sortedDescending().forEach { selectedPositions.sortedDescending().forEach {
val event = events[it] eventsToDelete.add(events[it])
eventsToDelete.add(event)
} }
events.removeAll(eventsToDelete) events.removeAll(eventsToDelete)