1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
Author: Kai-Chung Yan <seamlikok@gmail.com>
Last-Update: 2016-07-20
Description: Prepare build scripts
This patch modifies the build scripts so that the projects can be built for
Debian. It does the following:
* Exclude unused projects
* Removed unused tasks
* Use local artifacts to build
--- a/build.gradle
+++ b/build.gradle
@@ -3,41 +3,16 @@
buildscript {
ext.dataBindingRootFolder = project.projectDir
apply from: 'propLoader.gradle'
- ext.addRepos(repositories)
- if (ext.dataBindingConfig.addRemoteRepos) {
- dependencies {
- classpath "com.android.databinding:localizemaven:${dataBindingConfig.extraPluginsVersion}"
- }
- }
- dependencies {
- classpath 'net.sf.proguard:proguard-gradle:5.2.1'
- }
}
subprojects {
- if (dataBindingConfig.isIndependent) {
- apply plugin: 'maven'
- if (dataBindingConfig.addRemoteRepos && !dataBindingConfig.forGradlePlugin) {
- apply plugin: 'com.android.databinding.localizemaven'
- }
- } else {
- apply from: "${project.projectDir}/../../buildSrc/base/baseJava.gradle"
+ if (it.subprojects.isEmpty()) {
+ apply from: "${rootDir}/debian/generatePom.gradle"
}
if (it.name != "compilationTests") {
group = dataBindingConfig.group
version = dataBindingConfig.version
- uploadArchives {
- repositories {
- mavenDeployer {
- repository(url: "file://${dataBindingConfig.mavenRepoDir}")
- }
- }
- }
- }
-
- buildscript {
- addRepos(repositories)
}
}
@@ -69,7 +44,6 @@
"-PuseReleaseVersion=${dataBindingConfig.inReleaseBuild ? 'true' : 'false'}",
"-PaddRemoteRepos=${dataBindingConfig.addRemoteRepos ? 'true' : 'false'}",
"-PforGradlePlugin=${dataBindingConfig.forGradlePlugin ? 'true' : 'false'}"
-buildExtensionsTask.dependsOn subprojects.uploadArchives
def prepareExtensionPrebuilds = project.tasks.create "prepareExtensionPrebuilds", Exec
prepareExtensionPrebuilds.workingDir file('extensions').getAbsolutePath()
@@ -78,7 +52,6 @@
"-PuseReleaseVersion=${dataBindingConfig.inReleaseBuild ? 'true' : 'false'}",
"-PaddRemoteRepos=${dataBindingConfig.addRemoteRepos ? 'true' : 'false'}",
"-PforGradlePlugin=${dataBindingConfig.forGradlePlugin ? 'true' : 'false'}"
-prepareExtensionPrebuilds.dependsOn subprojects.uploadArchives
file('integration-tests').listFiles().findAll { it.isDirectory() }.each {
println("Creating run test task for ${it.getAbsolutePath()}.")
@@ -90,7 +63,6 @@
"-PuseReleaseVersion=${dataBindingConfig.inReleaseBuild ? 'true' : 'false'}",
"-PaddRemoteRepos=${dataBindingConfig.addRemoteRepos ? 'true' : 'false'}",
"-PforGradlePlugin=${dataBindingConfig.forGradlePlugin ? 'true' : 'false'}"
- testTask.dependsOn subprojects.uploadArchives
}
task runIntegrationTests {
@@ -114,16 +86,12 @@
}
}
-subprojects.uploadArchives.each { it.shouldRunAfter deleteRepo }
-subprojects.uploadArchives.each { it.shouldRunAfter deletePrebuildFolder }
-
buildExtensionsTask.shouldRunAfter deleteRepo
tasks['runTestsOfMultiModuleTestApp'].dependsOn tasks['runTestsOfIndependentLibrary']
task rebuildRepo() {
dependsOn deleteRepo
- dependsOn subprojects.uploadArchives
}
task copySamplesToEap(type : Copy) {
--- a/propLoader.gradle
+++ b/propLoader.gradle
@@ -6,7 +6,7 @@
databindingProperties.load(new FileInputStream("${root}/databinding.properties"))
// load android gradle plugin's version file
-apply from: "${root}/../buildSrc/base/version.gradle"
+apply from: 'debian/version.gradle'
databindingProperties.version = ext.buildVersion
databindingProperties.compileSdkVersion = Integer.parseInt(databindingProperties.compileSdkVersionStr)
@@ -19,7 +19,6 @@
databindingProperties.runProguard = (project.hasProperty('runProguard') && project.getProperty('runProguard').equals("true"))
// load version from gradle build file
-apply from: "$root/../buildSrc/base/version.gradle"
databindingProperties.androidPluginVersion=ext.buildVersion
databindingProperties.isIndependent = rootProject.name.equals("data-binding")
databindingProperties.eapOutDir = "${root}/${databindingProperties.eapOutFolderName}"
@@ -30,9 +29,6 @@
ext.dataBindingConfig.externalPrebuiltsBase = "${root}/../../prebuilts"
databindingProperties.megaRepoDir = "${databindingProperties.externalPrebuiltsBase}/tools/common/m2/repository"
-new File(ext.dataBindingConfig.mavenRepoDir).mkdir()
-new File(ext.dataBindingConfig.prebuildFolder).mkdir()
-
def addRemoteRepos = project.hasProperty('addRemoteRepos') && project.getProperty('addRemoteRepos').equals("true")
ext.dataBindingConfig.addRemoteRepos = addRemoteRepos
ext.dataBindingConfig.sharedSupportRepoDir = "${ext.dataBindingConfig.externalPrebuiltsBase}/maven_repo/android"
@@ -59,14 +55,6 @@
}
}
ext.addRepos = this.&addRepos
-subprojects {
- buildscript {
- addRepos(repositories)
- }
- repositories {
- addRepos(repositories)
- }
-}
def enablePublishing(p, addJavadoc) {
if (!ext.dataBindingConfig.isIndependent) {
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,5 @@
include ':dataBinding:baseLibrary'
project(':dataBinding:baseLibrary').projectDir = new File("baseLibrary")
-include ':dataBinding:compiler'
-project(':dataBinding:compiler').projectDir = new File("compiler")
-include ':dataBinding:compilationTests'
-project(':dataBinding:compilationTests').projectDir = new File("compilationTests")
include ':dataBinding:compilerCommon'
project(':dataBinding:compilerCommon').projectDir = new File("compilerCommon")
--- a/baseLibrary/build.gradle
+++ b/baseLibrary/build.gradle
@@ -68,4 +68,3 @@
project.ext.pomName = 'Data Binding Base Library'
project.ext.pomDesc = 'Shared library between Data Binding runtime lib and compiler'
-enablePublishing(this, true)
--- a/compilerCommon/build.gradle
+++ b/compilerCommon/build.gradle
@@ -22,6 +22,7 @@
srcDir 'src/main/java'
srcDir 'src/main/xml-gen'
srcDir 'src/main/grammar-gen'
+ srcDir "${rootDir}/debian/antlr4"
}
}
test {
@@ -69,7 +70,7 @@
// Using Java Properties appends date to the output which is bad for incremental compilation.
// Instead, we build it manually.
props.put("compilerCommon", project.version)
- props.put("compiler", rootProject.findProject("dataBinding:compiler").version)
+ props.put("compiler", project.version)
props.put("baseLibrary", rootProject.findProject("dataBinding:baseLibrary").version)
props.put("extensions", dataBindingConfig.extensionsVersion)
buildVersionFile.getParentFile().mkdirs()
@@ -85,5 +86,4 @@
tasks['exportBuildVersions'].dependsOn('processResources')
project.ext.pomName = 'Data Binding Compiler Common'
-project.ext.pomDesc = 'Common library that can be shared between different build tools'
-enablePublishing(this, true)
+project.ext.pomDesc = 'Common library that can be shared between different build tools'
\ No newline at end of file
|
