Merge pull request #942 from wordpress-mobile/update-publish-to-s3-plugin-to-0.7.0

oguzkocer · web-flow · commit 01da97c191e4 · 2021-10-28T08:52:49.000-04:00
Updates publish-to-s3 plugin to 0.7.0 and publishes '-sources.jar'
diff --git a/aztec/build.gradle b/aztec/build.gradle
@@ -83,13 +83,9 @@ project.afterEvaluate {
 
                 groupId "org.wordpress"
                 artifactId "aztec"
+                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
    }
 }
-
-publishToS3Plugin {
-    mavenPublishGroupId "org.wordpress"
-    mavenPublishArtifactId "aztec"
-}
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "com.android.application" apply false
     id "org.jetbrains.kotlin.android" apply false
+    id "com.automattic.android.publish-to-s3" apply false
 }
 
 allprojects {
diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle
@@ -38,13 +38,9 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "glide-loader"
+                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
    }
 }
-
-publishToS3Plugin {
-    mavenPublishGroupId "org.wordpress.aztec"
-    mavenPublishArtifactId "glide-loader"
-}
diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle
@@ -41,13 +41,9 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "picasso-loader"
+                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
    }
 }
-
-publishToS3Plugin {
-    mavenPublishGroupId "org.wordpress.aztec"
-    mavenPublishArtifactId "picasso-loader"
-}
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
         id "com.android.library" version gradle.ext.agpVersion
         id "com.android.application" version gradle.ext.agpVersion
         id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion
-        id "com.automattic.android.publish-to-s3" version "0.6.1"
+        id "com.automattic.android.publish-to-s3" version "0.7.0"
     }
     repositories {
         maven {
diff --git a/wordpress-comments/build.gradle b/wordpress-comments/build.gradle
@@ -55,13 +55,9 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "wordpress-comments"
+                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
    }
 }
-
-publishToS3Plugin {
-    mavenPublishGroupId "org.wordpress.aztec"
-    mavenPublishArtifactId "wordpress-comments"
-}
diff --git a/wordpress-shortcodes/build.gradle b/wordpress-shortcodes/build.gradle
@@ -52,13 +52,9 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "wordpress-shortcodes"
+                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
    }
 }
-
-publishToS3Plugin {
-    mavenPublishGroupId "org.wordpress.aztec"
-    mavenPublishArtifactId "wordpress-shortcodes"
-}

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,9 @@ project.afterEvaluate {`
`83`	`83`
`84`	`84`	`groupId "org.wordpress"`
`85`	`85`	`artifactId "aztec"`
	`86`	`+ artifact tasks.named("androidSourcesJar")`
`86`	`87`	`// version is set by 'publish-to-s3' plugin`
`87`	`88`	`}`
`88`	`89`	`}`
`89`	`90`	`}`
`90`	`91`	`}`
`91`		`-`
`92`		`-publishToS3Plugin {`
`93`		`- mavenPublishGroupId "org.wordpress"`
`94`		`- mavenPublishArtifactId "aztec"`
`95`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "com.android.application" apply false`
`3`	`3`	`id "org.jetbrains.kotlin.android" apply false`
	`4`	`+ id "com.automattic.android.publish-to-s3" apply false`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`allprojects {`
Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,9 @@ project.afterEvaluate {`
`38`	`38`
`39`	`39`	`groupId "org.wordpress.aztec"`
`40`	`40`	`artifactId "glide-loader"`
	`41`	`+ artifact tasks.named("androidSourcesJar")`
`41`	`42`	`// version is set by 'publish-to-s3' plugin`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`	`}`
`46`		`-`
`47`		`-publishToS3Plugin {`
`48`		`- mavenPublishGroupId "org.wordpress.aztec"`
`49`		`- mavenPublishArtifactId "glide-loader"`
`50`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,9 @@ project.afterEvaluate {`
`41`	`41`
`42`	`42`	`groupId "org.wordpress.aztec"`
`43`	`43`	`artifactId "picasso-loader"`
	`44`	`+ artifact tasks.named("androidSourcesJar")`
`44`	`45`	`// version is set by 'publish-to-s3' plugin`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`	`}`
`49`		`-`
`50`		`-publishToS3Plugin {`
`51`		`- mavenPublishGroupId "org.wordpress.aztec"`
`52`		`- mavenPublishArtifactId "picasso-loader"`
`53`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ pluginManagement {`
`6`	`6`	`id "com.android.library" version gradle.ext.agpVersion`
`7`	`7`	`id "com.android.application" version gradle.ext.agpVersion`
`8`	`8`	`id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion`
`9`		`- id "com.automattic.android.publish-to-s3" version "0.6.1"`
	`9`	`+ id "com.automattic.android.publish-to-s3" version "0.7.0"`
`10`	`10`	`}`
`11`	`11`	`repositories {`
`12`	`12`	`maven {`
Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,9 @@ project.afterEvaluate {`
`55`	`55`
`56`	`56`	`groupId "org.wordpress.aztec"`
`57`	`57`	`artifactId "wordpress-comments"`
	`58`	`+ artifact tasks.named("androidSourcesJar")`
`58`	`59`	`// version is set by 'publish-to-s3' plugin`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`	`}`
`63`		`-`
`64`		`-publishToS3Plugin {`
`65`		`- mavenPublishGroupId "org.wordpress.aztec"`
`66`		`- mavenPublishArtifactId "wordpress-comments"`
`67`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,9 @@ project.afterEvaluate {`
`52`	`52`
`53`	`53`	`groupId "org.wordpress.aztec"`
`54`	`54`	`artifactId "wordpress-shortcodes"`
	`55`	`+ artifact tasks.named("androidSourcesJar")`
`55`	`56`	`// version is set by 'publish-to-s3' plugin`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`	`}`
`60`		`-`
`61`		`-publishToS3Plugin {`
`62`		`- mavenPublishGroupId "org.wordpress.aztec"`
`63`		`- mavenPublishArtifactId "wordpress-shortcodes"`
`64`		`-}`