Skip to content

Commit 7b9ee9b

Browse files
authored
chore: Move publishing logic to convention plugin (#3105)
1 parent 7fce116 commit 7b9ee9b

33 files changed

Lines changed: 274 additions & 333 deletions

File tree

annotations/api/annotations.api

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
public abstract interface annotation class com/amplifyframework/annotations/AmplifyFlutterApi : java/lang/annotation/Annotation {
2+
}
3+
4+
public abstract interface annotation class com/amplifyframework/annotations/InternalAmplifyApi : java/lang/annotation/Annotation {
5+
}
6+
7+
public abstract interface annotation class com/amplifyframework/annotations/InternalApiWarning : java/lang/annotation/Annotation {
8+
}
9+

annotations/build.gradle.kts

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,9 @@
1515

1616
plugins {
1717
alias(libs.plugins.amplify.kotlin)
18-
id("maven-publish")
18+
alias(libs.plugins.amplify.publishing)
1919
}
2020

21-
java {
22-
withSourcesJar()
23-
withJavadocJar()
24-
}
25-
26-
apply(from = rootProject.file("configuration/publishing.gradle"))
27-
28-
group = properties["POM_GROUP"].toString()
29-
3021
dependencies {
3122
implementation(libs.kotlin.stdlib)
3223
}
33-
34-
afterEvaluate {
35-
// Disables this warning:
36-
// warning: listOf(classfile) MethodParameters attribute
37-
// introduced in version 52.0 class files is ignored in
38-
// version 51.0 class files
39-
// Root project has -Werror, so this warning
40-
// would fail the build, otherwise.
41-
tasks.withType<JavaCompile>().configureEach {
42-
options.compilerArgs.add("-Xlint:-classfile")
43-
}
44-
}

apollo/apollo-appsync-amplify/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ import java.util.Properties
33
plugins {
44
alias(libs.plugins.apollo)
55
alias(libs.plugins.amplify.android.library)
6-
alias(libs.plugins.amplify.api)
6+
alias(libs.plugins.amplify.publishing)
77
}
88

9-
apply(from = rootProject.file("configuration/publishing.gradle"))
10-
119
fun readVersion() = Properties().run {
1210
file("../version.properties").inputStream().use { load(it) }
1311
get("VERSION_NAME").toString()
1412
}
1513

1614
project.setProperty("VERSION_NAME", readVersion())
17-
group = properties["POM_GROUP"].toString()
1815

1916
android {
2017
namespace = "com.amplifyframework.apollo.appsync"

apollo/apollo-appsync/build.gradle.kts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@ import java.util.Properties
1717

1818
plugins {
1919
alias(libs.plugins.amplify.kotlin)
20-
id("maven-publish")
21-
}
22-
23-
java {
24-
withSourcesJar()
25-
withJavadocJar()
26-
}
27-
28-
kotlin {
29-
jvmToolchain(17)
20+
alias(libs.plugins.amplify.publishing)
3021
}
3122

3223
fun readVersion() = Properties().run {
@@ -36,8 +27,6 @@ fun readVersion() = Properties().run {
3627

3728
project.setProperty("VERSION_NAME", readVersion())
3829

39-
apply(from = rootProject.file("configuration/publishing.gradle"))
40-
4130
val packageInfoGenerator by tasks.registering {
4231
val constantsDir = project.layout.buildDirectory.dir("generated/sources/constants/java")
4332
val outputFile = constantsDir.get().file("com/amplifyframework/apollo/appsync/util/PackageInfo.kt").asFile

appsync/aws-sdk-appsync-amplify/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,15 @@ import java.util.Properties
1717

1818
plugins {
1919
alias(libs.plugins.amplify.android.library)
20-
alias(libs.plugins.amplify.api)
20+
alias(libs.plugins.amplify.publishing)
2121
}
2222

23-
apply(from = rootProject.file("configuration/publishing.gradle"))
24-
2523
fun readVersion() = Properties().run {
2624
file("../version.properties").inputStream().use { load(it) }
2725
get("VERSION_NAME").toString()
2826
}
2927

3028
project.setProperty("VERSION_NAME", readVersion())
31-
group = properties["POM_GROUP"].toString()
3229

3330
android {
3431
namespace = "com.amazonaws.sdk.appsync.amplify"

appsync/aws-sdk-appsync-core/build.gradle.kts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@ import java.util.Properties
1717

1818
plugins {
1919
alias(libs.plugins.amplify.kotlin)
20-
id("maven-publish")
21-
}
22-
23-
java {
24-
withSourcesJar()
25-
withJavadocJar()
26-
}
27-
28-
kotlin {
29-
jvmToolchain(17)
20+
alias(libs.plugins.amplify.publishing)
3021
}
3122

3223
fun readVersion() = Properties().run {
@@ -36,8 +27,6 @@ fun readVersion() = Properties().run {
3627

3728
project.setProperty("VERSION_NAME", readVersion())
3829

39-
apply(from = rootProject.file("configuration/publishing.gradle"))
40-
4130
val packageInfoGenerator by tasks.registering {
4231
val constantsDir = project.layout.buildDirectory.dir("generated/sources/constants/java")
4332
val outputFile = constantsDir.get().file("com/amazonaws/sdk/appsync/core/util/PackageInfo.kt").asFile

appsync/aws-sdk-appsync-events/build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,18 @@ import java.util.Properties
1818
plugins {
1919
alias(libs.plugins.amplify.android.library)
2020
alias(libs.plugins.kotlin.serialization)
21-
alias(libs.plugins.amplify.api)
21+
alias(libs.plugins.amplify.publishing)
2222
}
2323

24-
apply(from = rootProject.file("configuration/publishing.gradle"))
25-
2624
fun readVersion() = Properties().run {
2725
file("../version.properties").inputStream().use { load(it) }
2826
get("VERSION_NAME").toString()
2927
}
3028

3129
project.setProperty("VERSION_NAME", readVersion())
32-
group = properties["POM_GROUP"].toString()
3330

3431
android {
3532
namespace = "com.amazonaws.sdk.appsync.events"
36-
defaultConfig {
37-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
38-
}
39-
40-
testOptions {
41-
execution = "ANDROIDX_TEST_ORCHESTRATOR"
42-
}
4333
}
4434

4535
dependencies {

aws-analytics-pinpoint/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616
plugins {
1717
alias(libs.plugins.amplify.android.library)
1818
alias(libs.plugins.kotlin.serialization)
19-
alias(libs.plugins.amplify.api)
19+
alias(libs.plugins.amplify.publishing)
2020
}
2121

2222
apply(from = rootProject.file("configuration/checkstyle.gradle"))
23-
apply(from = rootProject.file("configuration/publishing.gradle"))
24-
25-
group = properties["POM_GROUP"].toString()
2623

2724
android {
2825
namespace = "com.amplifyframework.analytics.pinpoint"

aws-api-appsync/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515

1616
plugins {
1717
alias(libs.plugins.amplify.android.library)
18-
alias(libs.plugins.amplify.api)
18+
alias(libs.plugins.amplify.publishing)
1919
}
2020

2121
apply(from = rootProject.file("configuration/checkstyle.gradle"))
22-
apply(from = rootProject.file("configuration/publishing.gradle"))
23-
24-
group = properties["POM_GROUP"].toString()
2522

2623
android {
2724
namespace = "com.amplifyframework.appsync"

aws-api/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515

1616
plugins {
1717
alias(libs.plugins.amplify.android.library)
18-
alias(libs.plugins.amplify.api)
18+
alias(libs.plugins.amplify.publishing)
1919
}
2020

2121
apply(from = rootProject.file("configuration/checkstyle.gradle"))
22-
apply(from = rootProject.file("configuration/publishing.gradle"))
23-
24-
group = properties["POM_GROUP"].toString()
2522

2623
android {
2724
namespace = "com.amplifyframework.api.aws"

0 commit comments

Comments
 (0)