fixup! Upgrade to Gradle 8.1.1 and Android Gradle Plugin 8.0.2

mozilla · Jul 12, 2023 · 9dc81d9 · 9dc81d9
1 parent 2c6d99d
commit 9dc81d9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 37 deletions.
diff --git a/glean-core/android-native/build.gradle b/glean-core/android-native/build.gradle
@@ -46,6 +46,12 @@ android {
  test.jniLibs.srcDirs += "$buildDir/rustJniLibs/desktop"
  }
 
+ publishing {
+ singleVariant('release') {
+ withSourcesJar()
+ }
+ }
+
  // Uncomment to include debug symbols in native library builds.
  // packagingOptions { doNotStrip "**/*.so" }
 }

diff --git a/glean-core/android-native/publish.gradle b/glean-core/android-native/publish.gradle
@@ -60,27 +60,12 @@ ext.configurePublish = { jnaForTestConfiguration = null ->
  forUnitTestsJarTask.dependsOn(tasks["cargoBuild"])
  }
 
- task sourcesJar(type: Jar) {
- from android.sourceSets.main.java.srcDirs
- archiveClassifier = 'sources'
- }
-
- task javadoc(type: Javadoc) {
- source = android.sourceSets.main.java.srcDirs
- classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
- }
-
- task javadocJar(type: Jar, dependsOn: javadoc) {
- archiveClassifier = 'javadoc'
- from javadoc.destinationDir
- }
-
  publishing {
  publications {
  aar(MavenPublication) {
- artifact sourcesJar
- // Can't publish Javadoc yet: Glean isn't well behaved.
- // artifact javadocJar
+ project.afterEvaluate {
+  from components.release
+ }
 
  // If this goes haywire with
  // 'Cannot configure the 'publishing' extension after it has been accessed.',

diff --git a/glean-core/android/build.gradle b/glean-core/android/build.gradle
@@ -71,6 +71,12 @@ android {
  test.resources.srcDirs += "${project(':glean-native').buildDir}/rustJniLibs/desktop"
  }
 
+ publishing {
+ singleVariant('release') {
+ withSourcesJar()
+ }
+ }
+
  // Uncomment to include debug symbols in native library builds.
  // packagingOptions { doNotStrip "**/*.so" }
 

diff --git a/glean-core/android/publish.gradle b/glean-core/android/publish.gradle
@@ -19,31 +19,12 @@ ext.configurePublish = {
  def theArtifactId = project.ext.artifactId
  def theDescription = project.ext.description
 
- task sourcesJar(type: Jar) {
- from android.sourceSets.main.java.srcDirs
- archiveClassifier = 'sources'
- }
-
- task javadoc(type: Javadoc) {
- source = android.sourceSets.main.java.srcDirs
- classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
- }
-
- task javadocJar(type: Jar, dependsOn: javadoc) {
- archiveClassifier = 'javadoc'
- from javadoc.destinationDir
- }
-
  publishing {
  publications {
  aar(MavenPublication) {
  project.afterEvaluate {
  from components.release
  }
- //FIXME: is the artifact below now the default?
- //artifact sourcesJar
- // Can't publish Javadoc yet: Glean isn't well behaved.
- // artifact javadocJar
 
  // If this goes haywire with
  // 'Cannot configure the 'publishing' extension after it has been accessed.',