upgrade: 升级 AGP 部分 API 变动文件

afkT · afkT · commit d5d94df48711 · 2023-07-01T23:50:49.000+08:00
Former-commit-id: f9a152b
diff --git a/file/gradle/upload/bintray/bintrayUploadAndroid.gradle b/file/gradle/upload/bintray/bintrayUploadAndroid.gradle
@@ -70,7 +70,7 @@ install {
 // This generates sources.jar
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = "sources"
+    archiveClassifier = "sources"
 }
 
 task javadoc(type: Javadoc) {
@@ -82,7 +82,7 @@ task javadoc(type: Javadoc) {
 
 // This generates javadoc.jar
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
+    archiveClassifier = "javadoc"
     from javadoc.destinationDir
 }
 
diff --git a/file/gradle/upload/bintray/bintrayUploadJava.gradle b/file/gradle/upload/bintray/bintrayUploadJava.gradle
@@ -69,13 +69,13 @@ install {
 
 // This generates sources.jar
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
+    archiveClassifier = "sources"
     from sourceSets.main.allSource
 }
 
 // This generates javadoc.jar
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
+    archiveClassifier = "javadoc"
     from javadoc.destinationDir
 }
 
diff --git a/file/gradle/upload/sonatype/sonatypeUploadAndroid.gradle b/file/gradle/upload/sonatype/sonatypeUploadAndroid.gradle
@@ -63,7 +63,7 @@ ext["ossrhPassword"] = ossrhPassword
 // This generates sources.jar
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = "sources"
+    archiveClassifier = "sources"
 }
 
 task javadoc(type: Javadoc) {
@@ -75,7 +75,7 @@ task javadoc(type: Javadoc) {
 
 // This generates javadoc.jar
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
+    archiveClassifier = "javadoc"
     from javadoc.destinationDir
 }
 
diff --git a/file/gradle/upload/sonatype/sonatypeUploadJava.gradle b/file/gradle/upload/sonatype/sonatypeUploadJava.gradle
@@ -62,13 +62,13 @@ ext["ossrhPassword"] = ossrhPassword
 
 // This generates sources.jar
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
+    archiveClassifier = "sources"
     from sourceSets.main.allSource
 }
 
 // This generates javadoc.jar
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
+    archiveClassifier = "javadoc"
     from javadoc.destinationDir
 }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ install {`
`70`	`70`	`// This generates sources.jar`
`71`	`71`	`task sourcesJar(type: Jar) {`
`72`	`72`	`from android.sourceSets.main.java.srcDirs`
`73`		`- classifier = "sources"`
	`73`	`+ archiveClassifier = "sources"`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`task javadoc(type: Javadoc) {`
`@@ -82,7 +82,7 @@ task javadoc(type: Javadoc) {`
`82`	`82`
`83`	`83`	`// This generates javadoc.jar`
`84`	`84`	`task javadocJar(type: Jar, dependsOn: javadoc) {`
`85`		`- classifier = "javadoc"`
	`85`	`+ archiveClassifier = "javadoc"`
`86`	`86`	`from javadoc.destinationDir`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,13 @@ install {`
`69`	`69`
`70`	`70`	`// This generates sources.jar`
`71`	`71`	`task sourcesJar(type: Jar, dependsOn: classes) {`
`72`		`- classifier = "sources"`
	`72`	`+ archiveClassifier = "sources"`
`73`	`73`	`from sourceSets.main.allSource`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// This generates javadoc.jar`
`77`	`77`	`task javadocJar(type: Jar, dependsOn: javadoc) {`
`78`		`- classifier = "javadoc"`
	`78`	`+ archiveClassifier = "javadoc"`
`79`	`79`	`from javadoc.destinationDir`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ ext["ossrhPassword"] = ossrhPassword`
`63`	`63`	`// This generates sources.jar`
`64`	`64`	`task sourcesJar(type: Jar) {`
`65`	`65`	`from android.sourceSets.main.java.srcDirs`
`66`		`- classifier = "sources"`
	`66`	`+ archiveClassifier = "sources"`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`task javadoc(type: Javadoc) {`
`@@ -75,7 +75,7 @@ task javadoc(type: Javadoc) {`
`75`	`75`
`76`	`76`	`// This generates javadoc.jar`
`77`	`77`	`task javadocJar(type: Jar, dependsOn: javadoc) {`
`78`		`- classifier = "javadoc"`
	`78`	`+ archiveClassifier = "javadoc"`
`79`	`79`	`from javadoc.destinationDir`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,13 @@ ext["ossrhPassword"] = ossrhPassword`
`62`	`62`
`63`	`63`	`// This generates sources.jar`
`64`	`64`	`task sourcesJar(type: Jar, dependsOn: classes) {`
`65`		`- classifier = "sources"`
	`65`	`+ archiveClassifier = "sources"`
`66`	`66`	`from sourceSets.main.allSource`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// This generates javadoc.jar`
`70`	`70`	`task javadocJar(type: Jar, dependsOn: javadoc) {`
`71`		`- classifier = "javadoc"`
	`71`	`+ archiveClassifier = "javadoc"`
`72`	`72`	`from javadoc.destinationDir`
`73`	`73`	`}`
`74`	`74`