Skip to content

Commit 75ba61f

Browse files
authored
Updated targetSdkVersion and compileSdkVersion (#1514)
* Updated `targetSdkVersion` and `compileSdkVersion` to use Android API level 34 (released in October 2023). * Updated `targetSdkVersion` and `compileSdkVersion` to use Android API level 34 (released in October 2023). * Attempt at fixing JaCoCo issue. * Updated CHANGELOGs, READMEs and gradle.properties files. * Fixed Sample App's `AndroidManifest.xml`
1 parent 5b80e08 commit 75ba61f

34 files changed

Lines changed: 117 additions & 35 deletions

File tree

build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ configure(subprojects.findAll { it.path.startsWith(':sdk:') && it.path.count(':'
5151
group = "com.azure.android"
5252

5353
android {
54-
compileSdkVersion 30
54+
compileSdkVersion 34
5555
buildToolsVersion ("$gradleAndroidBuildToolsPluginVersion")
5656

5757
defaultConfig {
5858
minSdkVersion 15
59-
targetSdkVersion 30
59+
targetSdkVersion 34
6060
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
6161
}
6262

@@ -100,10 +100,15 @@ configure(subprojects.findAll { it.path.startsWith(':sdk:') && it.path.count(':'
100100
}
101101

102102
testOptions {
103-
unitTests {
104-
includeAndroidResources = true
105-
returnDefaultValues = true
103+
unitTests.all {
104+
jacoco {
105+
includeNoLocationClasses = true
106+
excludes = ['jdk.internal.*']
107+
}
106108
}
109+
110+
unitTests.includeAndroidResources = true
111+
unitTests.returnDefaultValues = true
107112
}
108113
}
109114

@@ -113,19 +118,15 @@ configure(subprojects.findAll { it.path.startsWith(':sdk:') && it.path.count(':'
113118

114119
task jacocoTestReport(type: JacocoReport) {
115120
group = "Reporting"
116-
description = "Generate Jacoco coverage reports"
121+
description = "Generate Jacoco reports"
122+
117123
reports {
118124
xml.enabled = true
119125
html.enabled = false
120126
csv.enabled = false
121127
}
122128
}
123129

124-
tasks.withType(Test) {
125-
junitJacoco.includeNoLocationClasses = true
126-
junitJacoco.excludes = ['jdk.internal.*']
127-
}
128-
129130
// Add dependency to the module containing azure custom checkstyle.
130131
dependencies {
131132
checkstyle project(":eng:code-quality-reports")

eng/pipelines/templates/variables/globals.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ variables:
22
Pool: azsdk-pool-mms-ubuntu-2004-general
33
OSVmImage: MMSUbuntu20.04
44
DocWardenVersion: '0.4.2'
5-
JavaBuildVersion: '1.8'
6-
JavaTestVersion: '1.8'
5+
JavaBuildVersion: '1.11'
6+
JavaTestVersion: '1.11'
77
Package.EnableSBOMSigning: true

samples/sample-chat-app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ plugins {
44
}
55

66
android {
7-
compileSdkVersion 30
7+
compileSdkVersion 34
88
buildToolsVersion "30.0.3"
99

1010
defaultConfig {
1111
applicationId "com.azure.android.communication.chat.sampleapp"
1212
minSdkVersion 24
13-
targetSdkVersion 30
13+
targetSdkVersion 34
1414
}
1515

1616
buildTypes {

samples/sample-chat-app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
android:supportsRtl="true"
1616
android:name=".MyAppConfiguration"
1717
>
18-
<activity android:name="com.azure.android.communication.chat.sampleapp.MainActivity">
18+
<activity android:name="com.azure.android.communication.chat.sampleapp.MainActivity"
19+
android:exported="true">
1920
<intent-filter>
2021
<action android:name="android.intent.action.MAIN" />
2122

sdk/communication/azure-communication-chat/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
### Bugs Fixed
99

1010
### Other Changes
11+
- Updated `targetSdkVersion` and `compileSdkVersion` from `30` to `34`.
1112

1213
## 2.0.2 (2024-01-18)
1314

sdk/communication/azure-communication-common/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
### Other Changes
99
- Introduction of `MicrosoftTeamsAppIdentifier` is a breaking change. It will impact any code that previously depended on the use of UnknownIdentifier with rawIDs starting with `28:orgid:`, `28:dod:`, or `28:gcch:`.
10+
- Updated `targetSdkVersion` and `compileSdkVersion` from `30` to `34`.
1011

1112
### Bugs Fixed
1213

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Release History
22

3+
## 1.0.0-beta.14 (2024-02-14)
4+
5+
### Other Changes
6+
- Updated `targetSdkVersion` and `compileSdkVersion` from `30` to `34`.
7+
8+
#### Dependency updates
9+
- Updated `azure-core-logging` dependency version to `1.0.0-beta.14`.
10+
311
## 1.0.0-beta.13 (2023-10-12)
412

513
### Other Changes

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.13</version>
20+
<version>1.0.0-beta.14</version>
2121
</dependency>
2222
```
2323
[//]: # ({x-version-update-end})
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.0.0-beta.13
1+
version=1.0.0-beta.14

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Release History
22

3+
## 1.0.0-beta.14 (2024-02-14)
4+
5+
### Other Changes
6+
- Updated `targetSdkVersion` and `compileSdkVersion` from `30` to `34`.
7+
8+
#### Dependency updates
9+
- Updated `azure-core` dependency version to `1.0.0-beta.14`.
10+
- Updated `azure-core-http` dependency version to `1.0.0-beta.14`.
11+
312
## 1.0.0-beta.13 (2023-10-12)
413

514
#### Dependency updates

0 commit comments

Comments
 (0)