Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 1 addition & 39 deletions JetLagged/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,39 +1 @@
#
# Copyright 2022 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m

# Turn on parallel compilation, caching and on-demand configuration
org.gradle.configureondemand=true
org.gradle.caching=true
org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
org.gradle.jvmargs=-Xmx4g
6 changes: 3 additions & 3 deletions JetLagged/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
accompanist = "0.37.3"
android-material3 = "1.14.0-alpha09"
androidGradlePlugin = "9.0.1"
androidGradlePlugin = "9.1.0"
androidx-activity-compose = "1.12.4"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2026.02.00"
androidx-compose-bom = "2026.02.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.2.0"
androidx-corektx = "1.17.0"
Expand Down Expand Up @@ -49,7 +49,7 @@ roborazzi = "1.59.0"
rome = "2.1.0"
room = "2.8.4"
secrets = "2.0.1"
spotless = "8.2.1"
spotless = "8.3.0"
# @keep
targetSdk = "33"
version-catalog-update = "1.1.0"
Expand Down
4 changes: 2 additions & 2 deletions JetLagged/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The Gradle wrapper's SHA-256 sum needs to be updated to match the new Gradle version (9.3.1). The current checksum is for Gradle 9.1.0, which will cause build failures.

distributionSha256Sum=22218d8a543194a32359b3323579685351668e1b93385b7410f13a48c5e02787

distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The distributionUrl has been updated to Gradle 9.3.1, but the distributionSha256Sum on line 17 has not been updated to match. This will cause the Gradle wrapper validation to fail.

Please update the SHA for gradle-9.3.1-bin.zip. The correct value is 2c0a252c5c4262a48191b63c40136a895c798864f704111327e5d7939955b544.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-medium medium

The distributionUrl has been updated to gradle-9.3.1-bin.zip, but the distributionSha256Sum remains set to the hash for Gradle 9.1.0 (a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806). This mismatch is a security concern as it indicates a failure in the integrity check, which will cause the Gradle wrapper to abort the download and break the build. Please update the distributionSha256Sum to the correct SHA-256 hash (e3f461a293d39f9621500318451b34a4140ac5f7435641da928b642a14a2432c) for gradle-9.3.1-bin.zip to ensure a secure and successful build process.

zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
40 changes: 1 addition & 39 deletions JetNews/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,39 +1 @@
#
# Copyright 2020 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m

# Turn on parallel compilation, caching and on-demand configuration
org.gradle.configureondemand=true
org.gradle.caching=true
org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
org.gradle.jvmargs=-Xmx4g
6 changes: 3 additions & 3 deletions JetNews/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
[versions]
accompanist = "0.37.3"
android-material3 = "1.14.0-alpha09"
androidGradlePlugin = "9.0.1"
androidGradlePlugin = "9.1.0"
androidx-activity-compose = "1.12.4"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2026.02.00"
androidx-compose-bom = "2026.02.01"
androidx-constraintlayout = "1.1.1"
androidx-core-splashscreen = "1.2.0"
androidx-corektx = "1.17.0"
Expand Down Expand Up @@ -53,7 +53,7 @@ roborazzi = "1.59.0"
rome = "2.1.0"
room = "2.8.4"
secrets = "2.0.1"
spotless = "8.2.1"
spotless = "8.3.0"
# @keep
targetSdk = "33"
version-catalog-update = "1.1.0"
Expand Down
4 changes: 2 additions & 2 deletions JetNews/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The Gradle wrapper's SHA-256 sum needs to be updated to match the new Gradle version (9.3.1). The current checksum is for Gradle 9.1.0, which will cause build failures.

distributionSha256Sum=22218d8a543194a32359b3323579685351668e1b93385b7410f13a48c5e02787

distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The distributionUrl has been updated to Gradle 9.3.1, but the distributionSha256Sum on line 17 has not been updated to match. This will cause the Gradle wrapper validation to fail.

Please update the SHA for gradle-9.3.1-bin.zip. The correct value is 2c0a252c5c4262a48191b63c40136a895c798864f704111327e5d7939955b544.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-medium medium

The distributionUrl has been updated to gradle-9.3.1-bin.zip, but the distributionSha256Sum remains set to the hash for Gradle 9.1.0 (a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806). This mismatch is a security concern as it indicates a failure in the integrity check, which will cause the Gradle wrapper to abort the download and break the build. Please update the distributionSha256Sum to the correct SHA-256 hash (e3f461a293d39f9621500318451b34a4140ac5f7435641da928b642a14a2432c) for gradle-9.3.1-bin.zip to ensure a secure and successful build process.

zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion Jetcaster/core/data-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ class PodcastWithExtraInfo {

override fun equals(other: Any?): Boolean = when {
other === this -> true

other is PodcastWithExtraInfo -> {
podcast == other.podcast &&
lastEpisodeDate == other.lastEpisodeDate &&
isFollowed == other.isFollowed
}

else -> false
}

Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/designsystem/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ fun PodcastImage(
.fillMaxSize(),
)
}

else -> {
Box(
modifier = modifier
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/domain-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/glancewidget/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ private fun calculateSizeBucket(): SizeBucket {

return when {
width < Sizes.minWidth -> SizeBucket.Invalid

width <= Sizes.smallBucketCutoffWidth ->
if (height >= Sizes.short) SizeBucket.Narrow else SizeBucket.NarrowShort

else ->
if (height >= Sizes.short) SizeBucket.Normal else SizeBucket.NormalShort
}
Expand All @@ -114,7 +116,7 @@ class JetcasterAppWidget : GlanceAppWidget() {
override suspend fun provideGlance(context: Context, id: GlanceId) {
val testState = JetcasterAppWidgetViewState(
episodeTitle =
"100 - Android 15 DP 1, Stable Studio Iguana, Cloud Photo Picker, and more!",
"100 - Android 15 DP 1, Stable Studio Iguana, Cloud Photo Picker, and more!",
podcastTitle = "Now in Android",
isPlaying = false,
albumArtUri = "https://static.libsyn.com/p/assets/9/f/f/3/" +
Expand All @@ -129,6 +131,7 @@ class JetcasterAppWidget : GlanceAppWidget() {
GlanceTheme {
when (sizeBucket) {
SizeBucket.Invalid -> WidgetUiInvalidSize()

SizeBucket.Narrow -> Widget(
iconSize = Sizes.medium,
imageUri = artUri,
Expand Down Expand Up @@ -224,6 +227,7 @@ fun PodcastText(title: String, subtitle: String, modifier: GlanceModifier = Glan
maxLines = 2,
)
}

else -> Column(modifier) {
Text(
text = title,
Expand Down
40 changes: 1 addition & 39 deletions Jetcaster/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,39 +1 @@
#
# Copyright 2020 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m

# Turn on parallel compilation, caching and on-demand configurationv
org.gradle.configureondemand=true
org.gradle.caching=true
org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
org.gradle.jvmargs=-Xmx4g
Loading
Loading