Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '0.9-migration'

Conflicts:
	build.gradle
  • Loading branch information...
commit efb82e506d0a8f0cc0e43b8a8631b39ed69ae4b6 2 parents d24740b + 74a055d
Jason Voegele authored
View
25 build.gradle
@@ -1,20 +1,33 @@
-usePlugin 'groovy'
-usePlugin 'maven'
-usePlugin 'eclipse'
+apply plugin: 'groovy'
+apply plugin: 'maven'
+apply plugin: 'eclipse'
-version = '0.8'
+version = '0.9'
group = 'com.jvoegele.gradle.plugins'
+configurations {
+ sshDeploy
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ sshDeploy 'org.apache.maven.wagon:wagon-ssh:1.0-beta-6'
+}
+
uploadArchives {
repositories.mavenDeployer {
- repository url: 'file:///tmp/maven2'
+ configuration = configurations.sshDeploy
+ repository(url: "scp://jvoegele@chilco.textdrive.com/web/public/maven2")
}
}
dependencies {
// Add all JAR files in the lib directory of theGradle installation directory
// to the groovy configuration (is also used by compile configuration)
- groovy fileTree(dir: new File(gradle.gradleHomeDir, 'lib'), includes: ['*.jar'])
+ groovy fileTree(dir: new File(gradle.gradleHomeDir, 'lib'), includes: ['**/*.jar'])
}
// Make sure all code is compiled, tested and checked before uploadArchives.
View
7 src/main/groovy/com/jvoegele/gradle/plugins/android/AndroidPlugin.groovy
@@ -4,7 +4,6 @@ import org.gradle.api.logging.LogLevel;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.plugins.ProjectPluginsContainer;
import com.jvoegele.gradle.tasks.android.ProGuard
import com.jvoegele.gradle.tasks.android.ProcessAndroidResources
@@ -14,7 +13,7 @@ import com.jvoegele.gradle.tasks.android.ProcessAndroidResources
*
* @author Jason Voegele (jason@jvoegele.com)
*/
-class AndroidPlugin implements Plugin {
+class AndroidPlugin implements Plugin<Project> {
private static final ANDROID_PROCESS_RESOURCES_TASK_NAME = "androidProcessResources"
private static final PROGUARD_TASK_NAME = "proguard"
private static final ANDROID_PACKAGE_DEBUG_TASK_NAME = "androidPackageDebug"
@@ -38,8 +37,8 @@ class AndroidPlugin implements Plugin {
boolean verbose = false
@Override
- public void use(Project project, ProjectPluginsContainer plugins) {
- JavaPlugin javaPlugin = plugins.usePlugin(JavaPlugin.class, project);
+ public void apply(Project project) {
+ project.plugins.apply(JavaPlugin.class)
this.project = project
this.logger = project.logger
Please sign in to comment.
Something went wrong with that request. Please try again.