Skip to content

Commit 4634efe

Browse files
authored
Merge pull request #57 from nerdic-coder/develop
iOS compress and cache improvements
2 parents bd8638d + 59d4efc commit 4634efe

File tree

13 files changed

+475
-127
lines changed

13 files changed

+475
-127
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## v4.1.0 (01/06/2019)
4+
5+
- [**enhancement**] New setting for clearing photos cache
6+
- [**enhancement**] Improve compression from iOS
7+
38
## v4.0.0 (31/05/2019)
49

510
- [**enhancement**] #48 Automatically sync photos between devices

android/app/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "com.nerdiccoder.blockphotos"
77
minSdkVersion 21
88
targetSdkVersion 28
9-
versionCode 7
10-
versionName "4.0"
9+
versionCode 8
10+
versionName "4.1"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {
@@ -16,6 +16,11 @@ android {
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}
1818
}
19+
lintOptions {
20+
// Or, if you prefer, you can continue to check for errors in release builds,
21+
// but continue the build even when errors are found:
22+
abortOnError false
23+
}
1924
}
2025

2126
repositories {

android/app/release/output.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"apkInfo": {
55
"type": "MAIN",
66
"splits": [],
7-
"versionCode": 6,
8-
"versionName": "3.0",
7+
"versionCode": 8,
8+
"versionName": "4.1",
99
"enabled": true,
1010
"outputFile": "app-release.apk",
1111
"fullName": "release",

package-lock.json

Lines changed: 216 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "block-photos",
3-
"version": "4.0.0",
3+
"version": "4.1.0",
44
"private": false,
55
"description": "The app for storing your photos privatly in the cloud!",
66
"repository": {
@@ -97,7 +97,7 @@
9797
"dependencies": {
9898
"@capacitor/core": "1.0.0",
9999
"@ionic/core": "4.4.2",
100-
"@sentry/browser": "5.3.0",
100+
"@sentry/browser": "5.4.0",
101101
"blueimp-load-image": "2.21.0",
102102
"browser-image-compression": "1.0.2",
103103
"compressorjs": "1.0.5",
@@ -114,32 +114,33 @@
114114
"@capacitor/android": "1.0.0",
115115
"@capacitor/cli": "1.0.0",
116116
"@capacitor/ios": "1.0.0",
117-
"@electron-forge/cli": "6.0.0-beta.34",
118-
"@electron-forge/maker-appx": "6.0.0-beta.34",
119-
"@electron-forge/maker-deb": "6.0.0-beta.34",
120-
"@electron-forge/maker-dmg": "6.0.0-beta.34",
121-
"@electron-forge/maker-pkg": "6.0.0-beta.34",
122-
"@electron-forge/maker-rpm": "6.0.0-beta.34",
123-
"@electron-forge/maker-squirrel": "6.0.0-beta.34",
124-
"@electron-forge/maker-zip": "6.0.0-beta.34",
125-
"@electron-forge/publisher-github": "6.0.0-beta.34",
117+
"@electron-forge/cli": "6.0.0-beta.39",
118+
"@electron-forge/maker-appx": "6.0.0-beta.39",
119+
"@electron-forge/maker-deb": "6.0.0-beta.39",
120+
"@electron-forge/maker-dmg": "6.0.0-beta.39",
121+
"@electron-forge/maker-pkg": "6.0.0-beta.39",
122+
"@electron-forge/maker-rpm": "6.0.0-beta.39",
123+
"@electron-forge/maker-squirrel": "6.0.0-beta.39",
124+
"@electron-forge/maker-zip": "6.0.0-beta.39",
125+
"@electron-forge/publisher-github": "6.0.0-beta.39",
126126
"@stencil/core": "0.18.1",
127-
"@types/jest": "24.0.11",
128-
"@types/puppeteer": "1.12.1",
127+
"@types/jest": "24.0.13",
128+
"@types/puppeteer": "1.12.4",
129129
"blockstack": "19.1.0",
130-
"electron": "4.1.4",
130+
"electron": "5.0.2",
131131
"husky": "2.3.0",
132-
"jest": "24.1.0",
133-
"jest-cli": "24.1.0",
134-
"nightwatch": "1.0.19",
132+
"jest": "24.8.0",
133+
"jest-cli": "24.8.0",
134+
"nightwatch": "1.1.11",
135135
"prettier": "1.17.1",
136-
"pretty-quick": "1.10.0",
137-
"puppeteer": "1.12.2",
136+
"pretty-quick": "1.11.0",
137+
"puppeteer": "1.17.0",
138138
"rollup-plugin-node-builtins": "2.1.2",
139139
"rollup-plugin-node-globals": "1.4.0",
140-
"selenium-standalone": "^6.15.6",
141-
"tslint": "5.16.0",
142-
"tslint-ionic-rules": "0.0.21"
140+
"selenium-standalone": "^6.16.0",
141+
"tslint": "5.17.0",
142+
"tslint-ionic-rules": "0.0.21",
143+
"workbox-build": "3.4.1"
143144
},
144145
"browserslist": [
145146
">0.2%",

0 commit comments

Comments
 (0)