Skip to content
This repository was archived by the owner on Jun 11, 2026. It is now read-only.

Commit 1ae8ef3

Browse files
khalpkhalp
authored
Update dependencies (#105)
* Update gradle plugin version * Update library dependencies * Clean up sample dependencies * Update Navigation Rail sample to new TwoPaneLayoutNav format * Update readme * Update Compose SDK dependencies * Fix lint errors
1 parent ff71a7a commit 1ae8ef3

33 files changed

Lines changed: 145 additions & 325 deletions

File tree

‎CompanionPane/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
compose true
2727
}
2828
composeOptions {
29-
kotlinCompilerExtensionVersion composeVersion
29+
kotlinCompilerExtensionVersion composeCompilerVersion
3030
}
3131
packagingOptions {
3232
jniLibs {

‎ComposeGallery/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
compose true
2727
}
2828
composeOptions {
29-
kotlinCompilerExtensionVersion composeVersion
29+
kotlinCompilerExtensionVersion composeCompilerVersion
3030
}
3131
packagingOptions {
3232
jniLibs {

‎Diary/build.gradle‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ plugins {
44
}
55

66
android {
7-
compileSdk 32
7+
compileSdk rootProject.ext.compileSdkVersion
88

99
defaultConfig {
1010
applicationId "com.microsoft.device.display.samples.diary"
11-
minSdk 29
12-
targetSdk 32
13-
versionCode 1
14-
versionName "1.0"
11+
minSdkVersion rootProject.ext.minSdkVersion
12+
targetSdkVersion rootProject.ext.targetSdkVersion
13+
testInstrumentationRunner rootProject.ext.config.testInstrumentationRunner
1514

16-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1715
vectorDrawables {
1816
useSupportLibrary true
1917
}
@@ -36,7 +34,7 @@ android {
3634
compose true
3735
}
3836
composeOptions {
39-
kotlinCompilerExtensionVersion composeVersion
37+
kotlinCompilerExtensionVersion composeCompilerVersion
4038
}
4139
packagingOptions {
4240
resources {

‎Diary/src/main/java/com/microsoft/device/display/samples/diary/MainActivity.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package com.microsoft.device.display.samples.diary
22

3+
import android.os.Build
34
import android.os.Bundle
45
import androidx.activity.ComponentActivity
56
import androidx.activity.compose.setContent
7+
import androidx.annotation.RequiresApi
68
import androidx.compose.foundation.layout.fillMaxSize
79
import androidx.compose.material.MaterialTheme
810
import androidx.compose.material.Surface
911
import androidx.compose.ui.Modifier
1012
import com.microsoft.device.display.samples.diary.ui.theme.DiaryTheme
1113

14+
@RequiresApi(Build.VERSION_CODES.O)
1215
class MainActivity : ComponentActivity() {
1316

1417
override fun onCreate(savedInstanceState: Bundle?) {

‎Diary/src/main/java/com/microsoft/device/display/samples/diary/MainApp.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.microsoft.device.display.samples.diary
22

3+
import android.os.Build
4+
import androidx.annotation.RequiresApi
35
import androidx.compose.runtime.Composable
46
import androidx.compose.runtime.getValue
57
import androidx.compose.runtime.mutableStateOf
@@ -15,6 +17,7 @@ import java.time.LocalDate
1517
/**
1618
* For handling window navigation for Surface Duo, this acts as a main Controller for both the Composable
1719
*/
20+
@RequiresApi(Build.VERSION_CODES.O)
1821
@Composable
1922
fun MainApp() {
2023
val context = LocalContext.current

‎DragAndDrop/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
compose true
2222
}
2323
composeOptions {
24-
kotlinCompilerExtensionVersion composeVersion
24+
kotlinCompilerExtensionVersion composeCompilerVersion
2525
}
2626
packagingOptions {
2727
jniLibs {

‎DualView/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
compose true
2727
}
2828
composeOptions {
29-
kotlinCompilerExtensionVersion composeVersion
29+
kotlinCompilerExtensionVersion composeCompilerVersion
3030
}
3131
packagingOptions {
3232
jniLibs {

‎DyAdd/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
android {
12-
compileSdk 32
12+
compileSdk rootProject.ext.compileSdkVersion
1313

1414
defaultConfig {
1515
applicationId "com.microsoft.device.display.samples.dyadd"
@@ -39,7 +39,7 @@ android {
3939
compose true
4040
}
4141
composeOptions {
42-
kotlinCompilerExtensionVersion composeVersion
42+
kotlinCompilerExtensionVersion composeCompilerVersion
4343
}
4444
packagingOptions {
4545
resources {

DyAdd/src/main/res/drawable/ic_launcher_background.xml renamed to DyAdd/src/main/res/values/ic_launcher_background.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
~ Licensed under the MIT License.
55
-->
66

7-
<resources xmlns:android="http://schemas.android.com/apk/res/android">
8-
<color android:name="ic_launcher_background">#FFFFFF</color>
7+
<resources>
8+
<color name="ic_launcher_background">#3DDC84</color>
99
</resources>

‎ExtendedCanvas/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
compose true
2727
}
2828
composeOptions {
29-
kotlinCompilerExtensionVersion composeVersion
29+
kotlinCompilerExtensionVersion composeCompilerVersion
3030
}
3131
packagingOptions {
3232
jniLibs {

0 commit comments

Comments
 (0)