Skip to content

Commit

Permalink
Release notes, version bump
Browse files Browse the repository at this point in the history
Fix JsonManager test missing argument
  • Loading branch information
maltaisn committed Jul 30, 2021
1 parent 1416dd2 commit a848a55
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ android {
applicationId "com.maltaisn.notes.sync"
minSdkVersion 21
targetSdkVersion 30
versionCode 10300
versionName "1.3.0"
versionCode 10400
versionName "1.4.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

kapt {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.maltaisn.notes.model.entity.PinnedStatus
import com.maltaisn.notes.model.entity.Reminder
import com.maltaisn.notes.testNote
import com.maltaisn.recurpicker.Recurrence
import com.nhaarman.mockitokotlin2.mock
import kotlinx.coroutines.runBlocking
import kotlinx.serialization.json.Json
import org.junit.After
Expand All @@ -60,7 +61,7 @@ class DefaultJsonManagerTest {
jsonManager = DefaultJsonManager(notesDao, labelsDao, Json {
encodeDefaults = false
ignoreUnknownKeys = true
})
}, mock())
}

@After
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

package com.maltaisn.notes.model

import com.maltaisn.notes.OpenForTesting
import com.maltaisn.notes.model.entity.Note
import com.maltaisn.recurpicker.RecurrenceFinder
import kotlinx.coroutines.flow.first
import java.util.Date
import javax.inject.Inject

@OpenForTesting
class ReminderAlarmManager @Inject constructor(
private val notesRepository: NotesRepository,
private val alarmCallback: ReminderAlarmCallback
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/play/release-notes/en-US/production.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- Fixed export feature causing crash.
- Add import feature for JSON data.
- Add periodical auto export feature to a JSON file.
- Add option to separate checked and unchecked items in list note.
- Added ability to hide all notes with a particular label.
- Added clickable links to edit screen.
- New Spanish translation.
- Many bug fixes.
8 changes: 4 additions & 4 deletions app/src/main/play/release-notes/fr-CA/production.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- Correction du plantage lors de l'exportation des données.
- Nouvelle fonctionnalité: importation des données JSON.
- Nouvelle fonctionnalité: exportation périodique des données.
- Nouvelle option: séparation des éléments cochés et non cochés dans les listes.
- Ajout d'une fonctionnalité pour cacher les notes ayant une étiquette en particulier.
- Ajout de liens cliquables lors de l'édition.
- Nouvelle traduction en espagnol.
- Plusieurs bugs corrigés.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# App version
# Must be updated manually in app/build.gradle!
# F-Droid only supports raw literals for auto update detection.
appVersion=1.3.0
appVersionCode=10300
# (F-Droid only supports raw literals for auto update detection)
appVersion=1.4.0
appVersionCode=10400

# Kotlin
kotlinVersion=1.5.10
Expand Down

0 comments on commit a848a55

Please sign in to comment.