Skip to content

Commit b957a61

Browse files
authored
Prepare Azure Core beta release for October 2021 (#904)
* Updated READMEs. * Updated dependency versions. * Updated more dependencies and removed unused ones. * Reverted version change to Google's Gradle Plugin. Added a few comments on which dependencies cannot be updated. * Updated Checkstyle XML files to look more like what's used in the Java repository. * Updated CHANGELOGs.
1 parent c44db41 commit b957a61

File tree

21 files changed

+104
-61
lines changed

21 files changed

+104
-61
lines changed

build.gradle

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,20 @@ buildscript {
1010
}
1111

1212
ext {
13+
// Updating the dependency below throws a 'java.lang.OutOfMemoryError: Metaspace' during build time.
1314
googleGmsServicesPluginVersion = "4.3.8"
1415
gradleAndroidBuildToolsPluginVersion = "30.0.3"
15-
gradleAndroidToolsPluginVersion = "4.0.1"
16+
// Need to make many changes before being able to update the gradle plugin version below.
17+
gradleAndroidToolsPluginVersion = "4.0.2"
1618
gradleJunitJacocoPluginVersion = "0.16.0"
1719
gradleDexcountPluginVersion = "3.0.0"
18-
gradleSpotbugsPluginVersion = "4.7.4"
19-
gradleAndroidJunit5PluginVersion = "1.7.1.1"
20+
gradleSpotbugsPluginVersion = "4.7.5"
21+
gradleAndroidJunit5PluginVersion = "1.8.0.0"
2022
jacocoVersion = "0.8.7"
21-
junitJupiterVersion = "5.7.2"
22-
mockitoVersion = "3.12.4"
23-
orgtestngVersion = "7.4.0"
24-
okHttpVersion = "4.9.1"
25-
powerMockVersion = "2.0.9"
26-
qualityReportsPuppycrawlVersion = "8.29"
23+
// Updating the dependency below causes a ClassDefNotFound exception with the current CheckStyle implementation
24+
// in the /eng/ directory.
25+
qualityReportsPuppycrawlVersion = "8.34"
2726
qualityReportsJunitVersion = "4.13.2"
28-
reactorCoreVersion = "3.3.11.RELEASE"
29-
reactorTestVersion = "3.3.11.RELEASE"
30-
slf4jApiVersion = "1.7.32"
31-
wireMockVersion = "2.27.2"
3227
}
3328

3429
dependencies {
@@ -261,26 +256,23 @@ allprojects {
261256

262257
ext {
263258
androidxTestVersion = "1.4.0"
264-
annotationsVersion = "1.1.0"
265259
appCompatVersion = "1.2.0"
266-
archCoreTestVersion = "2.1.0"
267260
azureCommunicationCommonVersion = "1.0.1"
268261
azureCoreVersion = "1.0.0-beta.7"
269-
concurrentFuturesVersion = "1.0.0"
270-
dataproviderVersion = "2.6"
271-
jacksonVersion = "2.12.5"
272-
jUnitVersion = "5.7.0"
273-
lifecycleVersion = "2.2.0"
274-
nimbusJoseJwtTestVersion = "9.13"
275-
okHttpVersion = "3.14.9"
276-
retrofitVersion = "2.9.0"
277-
retroFutureVersion = "1.7.3"
278-
roomVersion = "2.2.5"
262+
jacksonVersion = "2.13.0"
263+
junitJupiterVersion = "5.7.2"
264+
mockitoVersion = "4.0.0"
265+
nimbusJoseJwtTestVersion = "9.15.2"
266+
okHttpVersion = "3.14.9" // Do not upgrade, newer versions require a higher Android minSdkLevel
267+
orgtestngVersion = "7.4.0"
268+
powerMockVersion = "2.0.9"
269+
retroFutureVersion = "1.7.4"
279270
staxApiVersion = "1.0-2"
271+
slf4jApiVersion = "1.7.32"
280272
threeTenAbpVersion = "1.3.1"
281273
threeTenBpVersion = "1.5.1"
282274
trouterVersion = "0.1.1"
283-
workVersion = "2.4.0"
275+
wireMockVersion = "2.27.2"
284276
}
285277
}
286278

config/checkstyle/checkstyle-suppressions.xml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
<!-- Add Javadoc suppression for any test files (ie. ones that live under src/test/java). -->
88
<suppress checks="Javadoc" files="src[/\\]test[/\\]java[/\\].*.java"/>
99

10-
1110
<suppress checks="Javadoc" files=".*CoverageReporter\.java"/>
1211
<suppress checks="Javadoc" files=".*[/\\]implementation[/\\].*\.java"/>
13-
<suppress checks="Javadoc" files=".*[/\\]com[/\\]microsoft[/\\].*"/>
1412
<suppress checks="Header" files=".*package-info.java"/>
1513

14+
<!-- Suppress all checkstyle rules for Track 1/management libraries. -->
15+
<suppress checks="[a-zA-Z0-9]*" files=".*[/\\]com[/\\]microsoft[/\\].*"/>
16+
1617
<!-- ignore missing javadoc in samples -->
1718
<suppress checks="MissingJavadocMethod" files=".*[/\\]samples[/\\].*\.java"/>
1819
<suppress checks="MissingJavadocType" files=".*[/\\]samples[/\\].*\.java"/>
@@ -73,9 +74,12 @@
7374
<suppress checks="MethodName" files="SerdeJacksonAnnotationIntrospector.java"/>
7475

7576
<!-- Some classes are named *Builder but are not @ServiceClientBuilder -->
76-
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck" files="com.azure.android.core.http.httpurlconnection.HttpUrlConnectionAsyncHttpClientBuilder"/>
77+
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck"
78+
files="com.azure.android.core.http.httpurlconnection.HttpUrlConnectionAsyncHttpClientBuilder"/>
79+
7780
<!-- Some classes are named *Builder but are not @ServiceClientBuilder -->
78-
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck" files="com.azure.android.core.http.okhttp.OkHttpAsyncHttpClientBuilder"/>
81+
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck"
82+
files="com.azure.android.core.http.okhttp.OkHttpAsyncHttpClientBuilder"/>
7983

8084
<!-- Files licensed with alternate license in the header -->
8185
<suppress checks="Header" files="com.azure.android.core.util.CancellationToken.java"/>
@@ -87,7 +91,8 @@
8791
<!-- false positive, the field needs to be non-final for copy api to work -->
8892
<suppress checks="EnforceFinalFields" files="com.azure.android.core.http.HttpRequest.java"/>
8993

90-
<suppress checks="VisibilityModifier" files="com.azure.android.core.rest.implementation.HttpResponseExceptionInfo.java"/>
94+
<suppress checks="VisibilityModifier"
95+
files="com.azure.android.core.rest.implementation.HttpResponseExceptionInfo.java"/>
9196

9297
<!-- Do not worry about leaking implementation API out of azure-core-test -->
9398
<suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.android.core.test.*"/>
@@ -158,14 +163,20 @@
158163
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"
159164
files="com.azure.android.core.http.httpurlconnection.HttpUrlConnectionAsyncHttpClientBuilder.java"/>
160165

161-
<suppress checks="LineLength" files=".*[/\\]com[/\\]azure[/\\]android[/\\]communication[/\\]chat[/\\]implementation[/\\].*"/>
162-
<suppress checks="Indentation" files=".*[/\\]com[/\\]azure[/\\]android[/\\]communication[/\\]chat[/\\]implementation[/\\].*"/>
166+
<suppress checks="LineLength"
167+
files=".*[/\\]com[/\\]azure[/\\]android[/\\]communication[/\\]chat[/\\]implementation[/\\].*"/>
168+
<suppress checks="Indentation"
169+
files=".*[/\\]com[/\\]azure[/\\]android[/\\]communication[/\\]chat[/\\]implementation[/\\].*"/>
163170

164-
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger" files="com.azure.android.communication.chat.implementation.ChatImpl.java"/>
165-
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger" files="com.azure.android.communication.chat.implementation.ChatThreadImpl.java"/>
171+
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"
172+
files="com.azure.android.communication.chat.implementation.ChatImpl.java"/>
173+
<suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"
174+
files="com.azure.android.communication.chat.implementation.ChatThreadImpl.java"/>
166175

167-
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="com.azure.android.communication.chat.ChatThreadAsyncClient.java"/>
168-
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="com.azure.android.communication.chat.ChatThreadClient.java"/>
176+
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck"
177+
files="com.azure.android.communication.chat.ChatThreadAsyncClient.java"/>
178+
<suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck"
179+
files="com.azure.android.communication.chat.ChatThreadClient.java"/>
169180

170181
<!-- Parcel types are allowed to be exposed in public API -->
171182
<suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck"

config/checkstyle/checkstyle.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ page at http://checkstyle.sourceforge.net/config.html -->
2626
<property name="fileExtensions" value="java"/>
2727
</module>
2828

29-
<module name="FileTabCharacter">
30-
<!-- Checks that there are no tab characters in the file. -->
31-
</module>
29+
<!-- Checks that there are no tab characters in the file. -->
30+
<module name="FileTabCharacter" />
3231

33-
<module name="NewlineAtEndOfFile">
34-
<property name="lineSeparator" value="lf"/>
35-
</module>
32+
<!-- Checks that files end with a newline character. -->
33+
<module name="NewlineAtEndOfFile" />
3634

3735
<module name="RegexpSingleline">
3836
<!-- Checks that FIXME is not used in comments. TODO is preferred. -->

sdk/core/azure-core-credential/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Release History
22

3-
## 1.0.0-beta.8 (Unreleased)
3+
## 1.0.0-beta.8 (2021-10-08)
44

5+
### Other changes
6+
7+
#### Dependency updates
8+
- Updated `azure-core-logging` dependency version to `1.0.0-beta.8`.
59

610
## 1.0.0-beta.7 (2021-09-08)
711

sdk/core/azure-core-credential/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure Core Credentials provides shared primitives, abstractions, and helpers aut
1717
<dependency>
1818
<groupId>com.azure</groupId>
1919
<artifactId>azure-core-credential</artifactId>
20-
<version>1.0.0-beta.7</version>
20+
<version>1.0.0-beta.8</version>
2121
</dependency>
2222
```
2323
[//]: # ({x-version-update-end})

sdk/core/azure-core-http-httpurlconnection/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# Release History
22

3-
## 1.0.0-beta.8 (Unreleased)
3+
## 1.0.0-beta.8 (2021-10-08)
44

5+
### Other changes
6+
7+
#### Dependency updates
8+
- Updated `azure-core-http` dependency version to `1.0.0-beta.8`.
9+
- Updated `azure-core-logging` dependency version to `1.0.0-beta.8`.
510

611
## 1.0.0-beta.7 (2021-09-08)
712

sdk/core/azure-core-http-httpurlconnection/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure Core HttpUrlConnection HTTP client is a plugin for the `azure-core` HTTP c
1717
<dependency>
1818
<groupId>com.azure</groupId>
1919
<artifactId>azure-core-http-httpurlconnection</artifactId>
20-
<version>1.0.0-beta.7</version>
20+
<version>1.0.0-beta.8</version>
2121
</dependency>
2222
```
2323
[//]: # ({x-version-update-end})

sdk/core/azure-core-http-okhttp/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# Release History
22

3-
## 1.0.0-beta.8 (Unreleased)
3+
## 1.0.0-beta.8 (2021-10-08)
44

5+
### Other changes
6+
7+
#### Dependency updates
8+
- Updated `azure-core-http` dependency version to `1.0.0-beta.8`.
9+
- Updated `azure-core-logging` dependency version to `1.0.0-beta.8`.
510

611
## 1.0.0-beta.7 (2021-09-08)
712

sdk/core/azure-core-http-okhttp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure Core OkHttp HTTP client is a plugin for the `azure-core` HTTP client API.
1717
<dependency>
1818
<groupId>com.azure</groupId>
1919
<artifactId>azure-core-http-okhttp</artifactId>
20-
<version>1.0.0-beta.7</version>
20+
<version>1.0.0-beta.8</version>
2121
</dependency>
2222
```
2323
[//]: # ({x-version-update-end})

sdk/core/azure-core-http/CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# Release History
22

3-
## 1.0.0-beta.8 (Unreleased)
3+
## 1.0.0-beta.8 (2021-10-08)
44

5+
### Other changes
6+
7+
#### Dependency updates
8+
- Updated `azure-core` dependency version to `1.0.0-beta.8`.
9+
- Updated `azure-core-credential` dependency version to `1.0.0-beta.8`.
10+
- Updated `azure-core-logging` dependency version to `1.0.0-beta.8`.
511

612
## 1.0.0-beta.7 (2021-09-08)
713

0 commit comments

Comments
 (0)