Skip to content

Commit 462559d

Browse files
committed
Merge branch 'master' into FDroid
2 parents edf7228 + bef01da commit 462559d

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

app/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ android {
99
// applicationId 'de.k3b.android.contentproviderhelper.dev'
1010
minSdkVersion 8
1111
targetSdkVersion 21
12-
versionCode 4
13-
versionName "1.3.1"
12+
versionCode 5
13+
14+
// v1.3 (3)
15+
// v1.3.1 (4) (fdroid does not build yet with gradle-3.5 21.4.2017)
16+
// v1.3.1.1 (5) (gradle-3.3 25.4.2017)
17+
versionName "1.3.1.1"
1418
}
1519
buildTypes {
1620
debug {

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@ allprojects {
1414
jcenter()
1515
}
1616
}
17+
18+
// download and generate gradlew which is not part of this repository and is required by travis
19+
task wrapper(type: Wrapper) {
20+
gradleVersion = '3.3'
21+
}
22+

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-3.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)