Skip to content

Commit 31bd9a5

Browse files
authored
Merge pull request #56 from nerdic-coder/photo-viewer
Block Photos 4.0
2 parents 3fdce68 + 6afc192 commit 31bd9a5

30 files changed

+4216
-5679
lines changed

android/app/build.gradle

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
4+
compileSdkVersion 28
55
defaultConfig {
66
applicationId "com.nerdiccoder.blockphotos"
77
minSdkVersion 21
8-
targetSdkVersion 27
9-
versionCode 6
10-
versionName "3.0"
8+
targetSdkVersion 28
9+
versionCode 7
10+
versionName "4.0"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {
@@ -16,9 +16,6 @@ android {
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}
1818
}
19-
lintOptions {
20-
abortOnError false
21-
}
2219
}
2320

2421
repositories {
@@ -32,14 +29,11 @@ repositories {
3229

3330
dependencies {
3431
implementation fileTree(include: ['*.jar'], dir: 'libs')
35-
implementation 'com.android.support:appcompat-v7:27.1.1'
36-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
32+
implementation 'com.android.support:appcompat-v7:28.0.0'
3733
implementation project(':capacitor-android')
3834
testImplementation 'junit:junit:4.12'
39-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
40-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
41-
implementation 'com.google.firebase:firebase-messaging:17.4.0'
42-
implementation 'com.android.support:support-v4:27.1.1'
35+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
36+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
4337
}
4438

4539
apply from: 'capacitor.build.gradle'

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
11+
android:theme="@style/AppTheme"
12+
android:launchMode="singleTask">
1213

1314
<activity
1415
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.0'
10+
classpath 'com.android.tools.build:gradle:3.3.2'
1111
classpath 'com.google.gms:google-services:4.2.0'
1212

1313
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)