fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating Commons and gradle

Browse Source
This commit is contained in:
tibbi
2019-01-24 23:34:28 +01:00
parent 21b112b265
commit f30ab90e8e
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -52,7 +52,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:5.6.6' implementation 'com.simplemobiletools:commons:5.6.16'
implementation 'joda-time:joda-time:2.10.1' implementation 'joda-time:joda-time:2.10.1'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt
View File

@@ -5,6 +5,8 @@ import com.simplemobiletools.calendar.pro.helpers.*
import com.simplemobiletools.commons.activities.BaseSplashActivity import com.simplemobiletools.commons.activities.BaseSplashActivity
class SplashActivity : BaseSplashActivity() { class SplashActivity : BaseSplashActivity() {
override fun getAppPackageName() = packageName
override fun initActivity() { override fun initActivity() {
when { when {
intent.extras?.containsKey(DAY_CODE) == true -> Intent(this, MainActivity::class.java).apply { intent.extras?.containsKey(DAY_CODE) == true -> Intent(this, MainActivity::class.java).apply {

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHelper.kt
View File

@@ -244,7 +244,7 @@ class CalDAVHelper(val context: Context) {
// some calendars add repeatable event exceptions with using the "exdate" field, not by creating a child event that is an exception // some calendars add repeatable event exceptions with using the "exdate" field, not by creating a child event that is an exception
val exdate = cursor.getStringValue(CalendarContract.Events.EXDATE) ?: "" val exdate = cursor.getStringValue(CalendarContract.Events.EXDATE) ?: ""
if (exdate.isNotEmpty() && exdate.length > 8) { if (exdate.length > 8) {
val dates = exdate.split(",") val dates = exdate.split(",")
dates.forEach { dates.forEach {
event.repetitionExceptions.add(it.substring(0, 8)) event.repetitionExceptions.add(it.substring(0, 8))

4
build.gradle
View File

@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.3.10' ext.kotlin_version = '1.3.11'
repositories { repositories {
google() google()
@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Fri Oct 05 20:16:57 CEST 2018 #Thu Jan 24 23:19:46 CET 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip