Skip to content

Commit cd8f238

Browse files
Upgraded Gradle to 8.6.
Upgraded AGP (Android Gradle Plugin) to 8.3.1. Upgraded Protobuf plugin to 0.9.4. Removed deprecated android-maven-publish plugin.
1 parent c65cab0 commit cd8f238

File tree

6 files changed

+284
-230
lines changed

6 files changed

+284
-230
lines changed

build.gradle

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ buildscript {
44
google()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.5.4'
8-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
9-
classpath 'digital.wup:android-maven-publish:3.6.3'
7+
classpath 'com.android.tools.build:gradle:8.3.1'
8+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
109
}
1110
}
1211

@@ -21,8 +20,9 @@ allprojects {
2120
apply plugin: 'com.android.library'
2221

2322
android {
24-
compileSdkVersion 34
25-
buildToolsVersion '29.0.3'
23+
namespace 'com.google.android.apps.common.testing.accessibility.framework'
24+
compileSdk 34
25+
2626
defaultConfig {
2727
minSdkVersion 19
2828
targetSdkVersion 34
@@ -34,6 +34,13 @@ android {
3434
targetCompatibility 1.8
3535
sourceCompatibility 1.8
3636
}
37+
38+
publishing {
39+
singleVariant('release') {
40+
withJavadocJar()
41+
withSourcesJar()
42+
}
43+
}
3744
}
3845

3946
apply plugin: 'com.google.protobuf'
@@ -53,24 +60,6 @@ protobuf {
5360
}
5461
}
5562

56-
// Creates the source jar for release to maven central.
57-
task sourceJar(type: Jar) {
58-
classifier "sources"
59-
from android.sourceSets.main.java.srcDirs
60-
}
61-
62-
// Creates javadoc for the project.
63-
task javadoc(type: Javadoc) {
64-
source = android.sourceSets.main.java.srcDirs
65-
failOnError false // Currently cannot import android sdk javadoc references so we ignore errors.
66-
}
67-
68-
// Creates the source javadoc jar for release to maven central.
69-
task javadocJar(type: Jar) {
70-
classifier "javadoc"
71-
from javadoc
72-
}
73-
apply plugin: 'digital.wup.android-maven-publish'
7463
apply plugin: 'maven-publish'
7564

7665
// Creates the artifacts for release to maven central.
@@ -80,9 +69,9 @@ publishing {
8069
groupId 'com.google.android.apps.common.testing.accessibility.framework'
8170
artifactId 'accessibility-test-framework'
8271
version '4.1.1'
83-
from components.android
84-
artifact sourceJar
85-
artifact javadocJar
72+
afterEvaluate {
73+
from components.release
74+
}
8675
pom {
8776
name = 'Accessibility Test Framework'
8877
description = 'Library used to test for common accessibility issues.'

gradle/wrapper/gradle-wrapper.jar

-15.7 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)