Skip to content

Commit 501529c

Browse files
committed
Move release back to app module, as gradle release plugin can't handle submodules ...
1 parent 0d537df commit 501529c

File tree

4 files changed

+17
-68
lines changed

4 files changed

+17
-68
lines changed

app/build-includes/release.gradle

+13-4
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,20 @@
2323
* Boston, MA 02110-1301 USA
2424
*/
2525

26+
release {
27+
buildTasks = ['generateWhatsNew', 'build', 'uploadToPlayStore', 'githubRelease']
28+
versionPropertyFile = '../gradle.properties'
29+
versionProperties = ['version']
30+
failOnSnapshotDependencies = false // this is a temporary workround until version 3.0 is released, so that the plugin can be moved to the root project
31+
32+
git {
33+
requireBranch = 'master'
34+
pushToRemote = 'origin'
35+
}
36+
}
37+
2638
task uploadToPlayStore
2739
uploadToPlayStore.dependsOn {
2840
tasks.findAll { it.name.startsWith('publish') && it.name.endsWith("Release")}
2941
}
30-
31-
task onRelease(dependsOn: ['generateWhatsNew', 'build', 'uploadToPlayStore', 'githubRelease'])
32-
task afterRelease(dependsOn: ['resetWhatsNew'])
33-
42+
afterReleaseBuild.dependsOn("resetWhatsNew")

app/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ buildscript {
4848
}
4949
}
5050

51+
plugins {
52+
id 'net.researchgate.release' version '2.6.0'
53+
}
54+
5155
repositories {
5256
mavenCentral()
5357
jcenter()

build-includes/release.gradle

-36
This file was deleted.

build.gradle

-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +0,0 @@
1-
/*
2-
* AndFHEM - Open Source Android application to control a FHEM home automation
3-
* server.
4-
*
5-
* Copyright (c) 2011, Matthias Klass or third-party contributors as
6-
* indicated by the @author tags or express copyright attribution
7-
* statements applied by the authors. All third-party contributions are
8-
* distributed under license by Red Hat Inc.
9-
*
10-
* This copyrighted material is made available to anyone wishing to use, modify,
11-
* copy, or redistribute it subject to the terms and conditions of the GNU GENERAL PUBLIC LICENSE, as published by the Free Software Foundation.
12-
*
13-
* This program is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15-
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU GENERAL PUBLIC LICENSE
16-
* for more details.
17-
*
18-
* You should have received a copy of the GNU GENERAL PUBLIC LICENSE
19-
* along with this distribution; if not, write to:
20-
* Free Software Foundation, Inc.
21-
* 51 Franklin Street, Fifth Floor
22-
* Boston, MA 02110-1301 USA
23-
*/
24-
25-
plugins {
26-
id 'net.researchgate.release' version '2.6.0'
27-
}
28-
apply from: 'build-includes/release.gradle'

0 commit comments

Comments
 (0)