tslocum
/
meditationassistant
1
2
Fork 0
Code Issues 27 Pull Requests Releases Activity

Update dependencies

merge-requests/7/head
Trevor Slocum 2020-09-24 09:10:53 -07:00
parent fe9da0c854
commit 205147a1f8
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,3 +1,6 @@
1.6.1:
- Fix delayed completion sound on Android 10.0+
1.6.0:
- Fix open/save file dialog

20
MeditationAssistant/build.gradle
View File

@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 29
buildToolsVersion '29.0.3'
buildToolsVersion '30.0.2'
defaultConfig {
minSdkVersion 16
targetSdkVersion 29
versionCode 160
versionName "1.6.0"
versionCode 161
versionName "1.6.1"
applicationId "sh.ftp.rocketninelabs.meditationassistant"
manifestPlaceholders = [
@ -75,18 +75,18 @@ android {
}
dependencies {
implementation 'androidx.core:core:1.3.0'
implementation 'androidx.core:core:1.3.1'
implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
implementation 'androidx.media:media:1.1.0'
implementation 'androidx.media:media:1.2.0'
implementation 'androidx.fragment:fragment:1.2.5'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'ch.acra:acra-http:5.3.0'
implementation "net.openid:appauth:0.7.1"
implementation 'com.opencsv:opencsv:4.6'
implementation "com.squareup.okio:okio:2.2.2"
implementation 'net.openid:appauth:0.7.1'
implementation 'com.opencsv:opencsv:5.2'
implementation 'com.squareup.okio:okio:2.8.0'
implementation 'com.nononsenseapps:filepicker:4.2.1'
implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
implementation "net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0"
implementation 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'
}

2
MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MainActivity.java
View File

@ -1889,7 +1889,7 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
}
if (fullWakeUp) {
getMeditationAssistant().notifySession(2, false, false);
getMeditationAssistant().notifySession(2, false, true);
if (!getMeditationAssistant().getPrefs().getBoolean("pref_softfinish", false)) {
Intent openAlarmReceiverActivity = new Intent(getApplicationContext(), CompleteActivity.class);
openAlarmReceiverActivity.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

3
MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
View File

@ -2164,8 +2164,9 @@ public class MeditationAssistant extends Application {
}
closeCSVReader(reader, inputfile);
} catch (IOException e) {
} catch (Exception e) {
e.printStackTrace();
longToast("Failed to write CSV file: " + e.toString());
}
if (sessions.size() == 0) {

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.android.tools.build:gradle:4.0.1'
}
}