Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Oct 16, 2024
1 parent 74b2a79 commit 7680dcb
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0

- name: ktlint
uses: github/super-linter/slim@v5
uses: github/super-linter/slim@v7
env:
VALIDATE_ALL_CODEBASE: false
VALIDATE_KOTLIN: true
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
buildscript {
val compose_version by extra("1.6.4")
val wear_compose_version by extra("1.3.0")
val compose_version by extra("1.7.4")
val wear_compose_version by extra("1.4.0")
}
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.3.1" apply false
id("com.android.library") version "8.3.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
id("com.android.application") version "8.7.1" apply false
id("com.android.library") version "8.7.1" apply false
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
}
16 changes: 8 additions & 8 deletions composesensors/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("com.vanniktech.maven.publish") version "0.28.0"
id("com.vanniktech.maven.publish") version "0.30.0"
}

android {
Expand Down Expand Up @@ -35,18 +35,18 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.11"
kotlinCompilerExtensionVersion = "1.5.15"
}
}

dependencies {
val coreKtxVersion = "1.12.0"
val appCompatVersion = "1.6.1"
val materialVersion = "1.11.0"
val coreKtxVersion = "1.13.1"
val appCompatVersion = "1.7.0"
val materialVersion = "1.12.0"
val jUnitVersion = "4.13.2"
val androidJUnitVersion = "1.1.5"
val espressoVersion = "3.5.1"
val composeVersion = "1.6.4"
val androidJUnitVersion = "1.2.1"
val espressoVersion = "3.6.1"
val composeVersion = "1.7.4"

implementation("androidx.compose.runtime:runtime:$composeVersion")
implementation("androidx.compose.ui:ui:$composeVersion")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
16 changes: 8 additions & 8 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.11"
kotlinCompilerExtensionVersion = "1.5.15"
}
packaging {
resources {
Expand All @@ -70,14 +70,14 @@ android {
}

dependencies {
val composeVersion = "1.6.4"
val material3Version = "1.2.1"
val lifecycleRuntimeKtxVersion = "2.7.0"
val coreKtxVersion = "1.12.0"
val activityComposeVersion = "1.8.2"
val composeVersion = "1.7.4"
val material3Version = "1.3.0"
val lifecycleRuntimeKtxVersion = "2.8.6"
val coreKtxVersion = "1.13.1"
val activityComposeVersion = "1.9.3"
val jUnitVersion = "4.13.2"
val androidJUnitVersion = "1.1.5"
val espressoVersion = "3.5.1"
val androidJUnitVersion = "1.2.1"
val espressoVersion = "3.6.1"
val splashScreenVersion = "1.0.1"

implementation(project(mapOf("path" to ":composesensors")))
Expand Down
10 changes: 5 additions & 5 deletions wearablesample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.11"
kotlinCompilerExtensionVersion = "1.5.15"
}
packaging {
resources {
Expand All @@ -70,16 +70,16 @@ android {
dependencies {

implementation(project(mapOf("path" to ":composesensors")))
implementation("androidx.core:core-ktx:1.12.0")
implementation("com.google.android.gms:play-services-wearable:18.1.0")
implementation("androidx.core:core-ktx:1.13.1")
implementation("com.google.android.gms:play-services-wearable:18.2.0")
implementation("androidx.percentlayout:percentlayout:1.0.0")
implementation("androidx.legacy:legacy-support-v4:1.0.0")
implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}")
implementation("androidx.wear.compose:compose-material:${rootProject.extra["wear_compose_version"]}")
implementation("androidx.wear.compose:compose-foundation:${rootProject.extra["wear_compose_version"]}")
implementation("androidx.compose.ui:ui-tooling-preview:${rootProject.extra["compose_version"]}")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.activity:activity-compose:1.8.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
implementation("androidx.activity:activity-compose:1.9.3")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}")
debugImplementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}")
debugImplementation("androidx.compose.ui:ui-test-manifest:${rootProject.extra["compose_version"]}")
Expand Down

0 comments on commit 7680dcb

Please sign in to comment.