Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
Updates the following dependencies:

* compileSdk to 35
* androidx.core:core-ktx to 1.15.0
* org.jetbrains.kotlin:kotlin-stdlib-jdk7 to 2.0.21
* id("com.android.application") to 8.8.0
* id("org.jetbrains.kotlin.android") to 2.1.0
* Gradle to 8.11.1
* Also renames the savedState variable to savedInstanceState in AmbientActivity.kt and MainActivity.kt to match the base class.
  • Loading branch information
dkhawk committed Jan 14, 2025
1 parent e0b85bc commit e428560
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions WearOS/Wearable/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.example.wearos"
Expand Down Expand Up @@ -52,8 +52,8 @@ android {
// [START maps_wear_os_dependencies]
dependencies {
// [START_EXCLUDE]
implementation("androidx.core:core-ktx:1.13.1")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0")
implementation("androidx.core:core-ktx:1.15.0")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21")
// [END_EXCLUDE]
compileOnly("com.google.android.wearable:wearable:2.9.0")
implementation("com.google.android.support:wearable:2.9.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class AmbientActivity : AppCompatActivity(), AmbientModeSupport.AmbientCallbackP

private lateinit var mapFragment: SupportMapFragment

public override fun onCreate(savedState: Bundle?) {
super.onCreate(savedState)
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

// Set the layout. It only contains a SupportMapFragment and a DismissOverlay.
setContentView(R.layout.activity_main)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class MainActivity : AppCompatActivity(), OnMapReadyCallback,
private lateinit var mapFragment: SupportMapFragment
// [END_EXCLUDE]

public override fun onCreate(savedState: Bundle?) {
super.onCreate(savedState)
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

// Set the layout. It only contains a SupportMapFragment and a DismissOverlay.
setContentView(R.layout.activity_main)
Expand Down
4 changes: 2 additions & 2 deletions WearOS/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

plugins {
id("com.android.application") version "8.5.0" apply false
id("com.android.application") version "8.8.0" apply false
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") version "2.0.1" apply false
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
}
2 changes: 1 addition & 1 deletion WearOS/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jul 10 22:24:53 CEST 2024
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.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit e428560

Please sign in to comment.