Skip to content

Commit c02fb76

Browse files
SimonMarquisSimonMarquis
committed
Merge remote-tracking branch 'origin/main' into agp-9
2 parents 7807618 + ade8065 commit c02fb76

File tree

12 files changed

+22
-41
lines changed

12 files changed

+22
-41
lines changed

‎.github/workflows/Build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3232

3333
- name: Set up JDK 21
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
distribution: 'zulu'
3737
java-version: 21
@@ -223,7 +223,7 @@ jobs:
223223
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
224224

225225
- name: Set up JDK 21
226-
uses: actions/setup-java@v4
226+
uses: actions/setup-java@v5
227227
with:
228228
distribution: 'zulu'
229229
java-version: 21

‎.github/workflows/NightlyBaselineProfiles.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3232

3333
- name: Set up JDK 17
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
distribution: 'zulu'
3737
java-version: 17

‎.github/workflows/Release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2929

3030
- name: Set up JDK 17
31-
uses: actions/setup-java@v4
31+
uses: actions/setup-java@v5
3232
with:
3333
distribution: 'zulu'
3434
java-version: 17

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Then copy the resulting baseline profile from the emulator to [`app/src/main/bas
190190

191191
## Compose compiler metrics
192192

193-
Run the following command to get and analyse compose compiler metrics:
193+
Run the following command to get and analyze compose compiler metrics:
194194

195195
```bash
196196
./gradlew assembleRelease -PenableComposeCompilerMetrics=true -PenableComposeCompilerReports=true

‎build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@
1515
*/
1616

1717
import com.android.build.api.dsl.ApplicationExtension
18-
import com.android.build.api.dsl.CommonExtension
1918
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
2019
import com.google.samples.apps.nowinandroid.configureBadgingTasks
2120
import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
2221
import com.google.samples.apps.nowinandroid.configureKotlinAndroid
23-
import com.google.samples.apps.nowinandroid.configurePrintApksTask
2422
import org.gradle.api.Plugin
2523
import org.gradle.api.Project
2624
import org.gradle.kotlin.dsl.apply
2725
import org.gradle.kotlin.dsl.configure
28-
import org.gradle.kotlin.dsl.getByType
2926

3027
class AndroidApplicationConventionPlugin : Plugin<Project> {
3128
override fun apply(target: Project) {
@@ -41,8 +38,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
4138
configureGradleManagedDevices(this)
4239
}
4340
extensions.configure<ApplicationAndroidComponentsExtension> {
44-
configurePrintApksTask(this)
45-
configureBadgingTasks(extensions.getByType<CommonExtension>(), this)
41+
configureBadgingTasks(this)
4642
}
4743
}
4844
}

‎build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
package com.google.samples.apps.nowinandroid
1818

19-
import com.android.SdkConstants
2019
import com.android.build.api.artifact.SingleArtifact
21-
import com.android.build.api.dsl.CommonExtension
20+
import com.android.build.api.variant.Aapt2
2221
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
2322
import com.google.common.truth.Truth.assertWithMessage
2423
import org.gradle.api.DefaultTask
@@ -110,7 +109,6 @@ private fun String.capitalized() = replaceFirstChar {
110109
}
111110

112111
fun Project.configureBadgingTasks(
113-
baseExtension: CommonExtension,
114112
componentsExtension: ApplicationAndroidComponentsExtension,
115113
) {
116114
// Registers a callback to be called, when a new variant is configured
@@ -121,17 +119,7 @@ fun Project.configureBadgingTasks(
121119
val generateBadging =
122120
tasks.register<GenerateBadgingTask>(generateBadgingTaskName) {
123121
apk = variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE)
124-
aapt2Executable.set(
125-
// TODO: Replace with `sdkComponents.aapt2` when it's available in AGP
126-
// https://issuetracker.google.com/issues/376815836
127-
componentsExtension.sdkComponents.sdkDirectory.map { directory ->
128-
directory.file(
129-
"${SdkConstants.FD_BUILD_TOOLS}/" +
130-
"${baseExtension.buildToolsVersion}/" +
131-
SdkConstants.FN_AAPT2,
132-
)
133-
}
134-
)
122+
aapt2Executable = componentsExtension.sdkComponents.aapt2.flatMap(Aapt2::executable)
135123
badging = project.layout.buildDirectory.file(
136124
"outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",
137125
)

‎build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2727
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
2828
import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
2929
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
30+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3031

3132
/**
3233
* Configure base Kotlin with Android options
@@ -85,6 +86,9 @@ private inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() =
8586
is KotlinJvmProjectExtension -> compilerOptions
8687
else -> TODO("Unsupported project extension $this ${T::class}")
8788
}.apply {
89+
// TODO: move remove languageVersion and coreLibrariesVersion after upgrading to AGP 9.0
90+
languageVersion.set(KotlinVersion.KOTLIN_2_2)
91+
coreLibrariesVersion = "2.2.21"
8892
jvmTarget = JvmTarget.JVM_11
8993
allWarningsAsErrors = warningsAsErrors
9094
freeCompilerArgs.add(

‎build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ fun configureFlavors(
2424
flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {},
2525
) {
2626
commonExtension.apply {
27-
FlavorDimension.values().forEach { flavorDimension ->
27+
FlavorDimension.entries.forEach { flavorDimension ->
2828
flavorDimensions += flavorDimension.name
2929
}
3030

3131
productFlavors.apply flavors@{
32-
NiaFlavor.values().forEach { niaFlavor ->
32+
NiaFlavor.entries.forEach { niaFlavor ->
3333
register(niaFlavor.name) {
3434
dimension = niaFlavor.dimension.name
3535
flavorConfigurationBlock(this, niaFlavor)

‎core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/ConnectivityManagerNetworkMonitor.kt‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import android.net.Network
2323
import android.net.NetworkCapabilities
2424
import android.net.NetworkRequest
2525
import android.net.NetworkRequest.Builder
26-
import android.os.Build.VERSION
27-
import android.os.Build.VERSION_CODES
2826
import androidx.core.content.getSystemService
2927
import androidx.tracing.trace
3028
import com.google.samples.apps.nowinandroid.core.network.Dispatcher
@@ -90,13 +88,8 @@ internal class ConnectivityManagerNetworkMonitor @Inject constructor(
9088
.flowOn(ioDispatcher)
9189
.conflate()
9290

93-
@Suppress("DEPRECATION")
94-
private fun ConnectivityManager.isCurrentlyConnected() = when {
95-
VERSION.SDK_INT >= VERSION_CODES.M ->
96-
activeNetwork
97-
?.let(::getNetworkCapabilities)
98-
?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
99-
100-
else -> activeNetworkInfo?.isConnected
101-
} ?: false
91+
private fun ConnectivityManager.isCurrentlyConnected(): Boolean {
92+
val networkCapabilities = getNetworkCapabilities(activeNetwork) ?: return false
93+
return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
94+
}
10295
}

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ hilt = "2.57.2"
4646
hiltExt = "1.2.0"
4747
jacoco = "0.8.12"
4848
junit4 = "4.13.2"
49-
kotlin = "2.2.21"
49+
kotlin = "2.3.0"
5050
kotlinxCoroutines = "1.10.1"
5151
kotlinxDatetime = "0.6.1"
5252
kotlinxSerializationJson = "1.8.0"
53-
ksp = "2.3.1"
53+
ksp = "2.3.4"
5454
okhttp = "4.12.0"
5555
protobuf = "4.29.2"
5656
protobufPlugin = "0.9.5"

0 commit comments

Comments
 (0)