From 5f73989dad31d6a04c0f45dc47d9a2a2f4f8a86f Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 25 Jan 2019 23:39:35 +0100 Subject: [PATCH] updating commons, gradle and kotlin --- app/build.gradle | 2 +- .../simplemobiletools/notes/pro/activities/SplashActivity.kt | 2 ++ build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b1e329a4..23d2934b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.6.1' + implementation 'com.simplemobiletools:commons:5.6.17' kapt 'androidx.room:room-compiler:2.0.0' implementation 'androidx.room:room-runtime:2.0.0' diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt index 45c8e25f..cb503fff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt @@ -5,6 +5,8 @@ import com.simplemobiletools.commons.activities.BaseSplashActivity import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID class SplashActivity : BaseSplashActivity() { + override fun getAppPackageName() = packageName + override fun initActivity() { if (intent.extras?.containsKey(OPEN_NOTE_ID) == true) { Intent(this, MainActivity::class.java).apply { diff --git a/build.gradle b/build.gradle index d93366c1..7694217e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.11' + ext.kotlin_version = '1.3.20' repositories { google() @@ -9,7 +9,7 @@ buildscript { } 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" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ef68e370..c63deaec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 18 14:57:45 CEST 2018 +#Thu Jan 24 21:40:27 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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