Skip to content

Commit d2bfddf

Browse files
committed
* Gradle and Build Tools pushed to new versions
1 parent f7948aa commit d2bfddf

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

app/build.gradle

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

33
android {
44
compileSdkVersion 27
5-
buildToolsVersion '27.0.3'
5+
buildToolsVersion '28.0.2'
66
defaultConfig {
77
applicationId "com.todobom.opennotescanner"
88
minSdkVersion 21
@@ -16,32 +16,40 @@ android {
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}
1818
}
19+
flavorDimensions "version"
1920
productFlavors {
2021
fdroid {
22+
dimension "version"
23+
applicationIdSuffix ".fdroid"
24+
versionNameSuffix "-fdroid"
2125
}
2226
gplay {
27+
dimension "version"
28+
applicationIdSuffix ".gplay"
29+
versionNameSuffix "-gplay"
2330
}
2431
}
2532
lintOptions {
2633
abortOnError false
2734
}
35+
2836
}
2937

3038
repositories {
3139
maven { url "https://jitpack.io" }
3240
}
3341

3442
dependencies {
35-
compile fileTree(include: ['*.jar'], dir: 'libs')
36-
testCompile 'junit:junit:4.12'
37-
compile 'com.android.support:appcompat-v7:27.0.0'
38-
compile 'com.android.support:design:27.0.0'
39-
compile 'com.google.zxing:core:3.0.1'
40-
compile 'com.android.support:support-v4:27.0.0'
41-
compile 'com.github.ctodobom:OpenCV-3.1.0-Android:9e00ee4218ca0c9e60a905c9f09bf499f9dc5115'
42-
compile 'us.feras.mdv:markdownview:1.1.0'
43-
compile 'com.github.ctodobom:drag-select-recyclerview:0.3.4.ctodobom.sections'
44-
compile 'com.github.nostra13:Android-Universal-Image-Loader:v1.9.5'
45-
compile 'com.github.ctodobom:FabToolbar:3c5f0e0ff1b6d5089e20b7da7157a604075ae943'
46-
compile 'org.piwik.sdk:piwik-sdk:0.0.4'
43+
implementation fileTree(include: ['*.jar'], dir: 'libs')
44+
testImplementation 'junit:junit:4.12'
45+
implementation 'com.android.support:appcompat-v7:27.0.0'
46+
implementation 'com.android.support:design:27.0.0'
47+
implementation 'com.google.zxing:core:3.0.1'
48+
implementation 'com.android.support:support-v4:27.0.0'
49+
implementation 'com.github.ctodobom:OpenCV-3.1.0-Android:9e00ee4218ca0c9e60a905c9f09bf499f9dc5115'
50+
implementation 'us.feras.mdv:markdownview:1.1.0'
51+
implementation 'com.github.ctodobom:drag-select-recyclerview:0.3.4.ctodobom.sections'
52+
implementation 'com.github.nostra13:Android-Universal-Image-Loader:v1.9.5'
53+
implementation 'com.github.ctodobom:FabToolbar:3c5f0e0ff1b6d5089e20b7da7157a604075ae943'
54+
implementation 'org.piwik.sdk:piwik-sdk:0.0.4'
4755
}

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.todobom.opennotescanner">
44

5-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27"/>
6-
75
<uses-feature
86
android:name="android.hardware.camera"
97
android:required="false" />

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:2.2.3'
12+
classpath 'com.android.tools.build:gradle:3.2.0'
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jul 11 23:40:44 CEST 2017
1+
#Sun Nov 11 17:00:46 BRST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)