diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-28 17:35:32 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-09-28 17:35:32 -0700 |
| commit | e94522078a7e3cc77671cddd111f80703c1f1868 (patch) | |
| tree | 622fd5436bb545816949086a98e56f1a8289cefd /gradle | |
| parent | 6c67a701c324f775bec8ba129ceea0965ad84039 (diff) | |
| download | build-e94522078a7e3cc77671cddd111f80703c1f1868.tar.gz | |
Fix manifest merging.
minSdkVersion/targetSdkVersion/versionCode/versionName are now
inserted into the generated/merged manifest instead of when
packaging the APK. This allows proper conflict detection
when merging the manifest of the library projects.
Also move all testapps to not use mavenLocal due to
an issue with it (failure to read resource file inside
the plugin).
Change-Id: I46aa9563cbc31fe45bc0f1a44ed48ae110cb376e
Diffstat (limited to 'gradle')
| -rw-r--r-- | gradle/build.gradle | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gradle/build.gradle b/gradle/build.gradle index 64aa41e..1a95340 100644 --- a/gradle/build.gradle +++ b/gradle/build.gradle @@ -30,11 +30,12 @@ archivesBaseName = 'gradle' uploadArchives { repositories { mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signPom(deployment) } + //beforeDeployment { MavenDeployment deployment -> signPom(deployment) } - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: sonatypeUsername, password: sonatypePassword) - } + //repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { + // authentication(userName: sonatypeUsername, password: sonatypePassword) + //} + repository(url: uri("$rootDir/repo")) pom.project { name 'Gradle Plug-in for Android' |