Skip to content

Commit cc53317

Browse files
yschimkeyschimke
authored
Quick fix for samples when imported in Android Studio (android#231)
1 parent 56d3be7 commit cc53317

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1693
-92
lines changed

‎.github/workflows/AlwaysOnKotlin.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'AlwaysOnKotlin/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'AlwaysOnKotlin/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: AlwaysOnKotlin

‎.github/workflows/ComposeAdvanced.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'ComposeAdvanced/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'ComposeAdvanced/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: ComposeAdvanced

‎.github/workflows/ComposeStarter.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'ComposeStarter/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'ComposeStarter/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: ComposeStarter

‎.github/workflows/DataLayer.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'DataLayer/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'DataLayer/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: DataLayer

‎.github/workflows/RuntimePermissionsWear.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'RuntimePermissionsWear/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'RuntimePermissionsWear/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: RuntimePermissionsWear

‎.github/workflows/TimeText.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'TimeText/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'TimeText/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: TimeText

‎.github/workflows/WatchFaceKotlin.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'WatchFaceKotlin/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'WatchFaceKotlin/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: WatchFaceKotlin

‎.github/workflows/WearComplicationDataSourcesTestSuite.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'WearComplicationDataSourcesTestSuite/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'WearComplicationDataSourcesTestSuite/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: WearComplicationDataSourcesTestSuite

‎.github/workflows/WearOAuth.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'WearOAuth/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'WearOAuth/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: WearOAuth

‎.github/workflows/WearSpeakerSample.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'WearSpeakerSample/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'WearSpeakerSample/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: WearSpeakerSample

‎.github/workflows/WearStandaloneGoogleSignIn.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'WearStandaloneGoogleSignIn/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'WearStandaloneGoogleSignIn/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: WearStandaloneGoogleSignIn

‎.github/workflows/WearTilesKotlin.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'WearTilesKotlin/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'WearTilesKotlin/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: WearTilesKotlin

‎.github/workflows/WearVerifyRemoteApp.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ on:
66
- main
77
paths:
88
- 'WearVerifyRemoteApp/**'
9-
- 'gradle/**'
109
pull_request:
1110
paths:
1211
- 'WearVerifyRemoteApp/**'
13-
- 'gradle/**'
1412

1513
env:
1614
SAMPLE_PATH: WearVerifyRemoteApp

‎gradle/libs.versions.toml ‎AlwaysOnKotlin/gradle/libs.versions.toml

File renamed without changes.

‎AlwaysOnKotlin/settings.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ dependencyResolutionManagement {
3131
google()
3232
mavenCentral()
3333
}
34-
versionCatalogs {
35-
libs {
36-
from(files("../gradle/libs.versions.toml"))
37-
}
38-
}
3934
}
4035

4136

‎ComposeAdvanced/gradle/libs.versions.toml

+141
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
[versions]
2+
androidx-activity = "1.4.0"
3+
androidx-lifecycle = "2.4.1"
4+
androidx-test = "1.4.0"
5+
androidx-wear-compose = "1.0.0-alpha17"
6+
androidx-wear-tiles = "1.0.1"
7+
androidx-wear-watchface = "1.0.1"
8+
compose = "1.2.0-alpha04"
9+
org-jetbrains-kotlin = "1.6.10"
10+
org-jetbrains-kotlinx = "1.6.0"
11+
ktlint = "0.41.0"
12+
13+
[libraries]
14+
android-build-gradle = "com.android.tools.build:gradle:7.1.1"
15+
android-desugarjdklibs = "com.android.tools:desugar_jdk_libs:1.1.5"
16+
android-lint-gradle = "com.android.tools.lint:lint-gradle:30.1.1"
17+
android-material = "com.google.android.material:material:1.5.0"
18+
android-tools-lint-gradle = "com.android.tools.lint:lint-gradle:30.1.1"
19+
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
20+
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
21+
androidx-appcompat = "androidx.appcompat:appcompat:1.4.1"
22+
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.3"
23+
androidx-constraintlayout-compose = "androidx.constraintlayout:constraintlayout-compose:1.0.0"
24+
androidx-core-ktx = "androidx.core:core-ktx:1.7.0"
25+
androidx-databinding-viewbinding = "androidx.databinding:viewbinding:7.1.1"
26+
androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.0.0"
27+
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.1"
28+
androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" }
29+
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
30+
androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
31+
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
32+
androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
33+
androidx-media = "androidx.media:media:1.5.0"
34+
androidx-wear = "androidx.wear:wear:1.2.0"
35+
androidx-wear-watchface-complications-data-source-ktx = "androidx.wear.watchface:watchface-complications-data-source-ktx:1.0.1"
36+
androidx-window = "androidx.window:window:1.0.0"
37+
com-google-truth = "com.google.truth:truth:1.1.3"
38+
compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose" }
39+
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
40+
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
41+
compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
42+
compose-material-ripple = { module = "androidx.compose.material:material-ripple", version.ref = "compose" }
43+
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
44+
compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
45+
compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
46+
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
47+
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
48+
jacoco-ant = "org.jacoco:org.jacoco.ant:0.8.7"
49+
junit = "junit:junit:4.13.2"
50+
kotlin-annotation-processing-gradle = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-gradle", version.ref = "org-jetbrains-kotlin" }
51+
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "org-jetbrains-kotlin" }
52+
kotlin-parcelize-compiler = { module = "org.jetbrains.kotlin:kotlin-parcelize-compiler", version.ref = "org-jetbrains-kotlin" }
53+
kotlin-parcelize-runtime = { module = "org.jetbrains.kotlin:kotlin-parcelize-runtime", version.ref = "org-jetbrains-kotlin" }
54+
kotlin-scripting-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable", version.ref = "org-jetbrains-kotlin" }
55+
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "org-jetbrains-kotlin" }
56+
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "org-jetbrains-kotlin" }
57+
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "org-jetbrains-kotlinx" }
58+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "org-jetbrains-kotlinx" }
59+
kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "org-jetbrains-kotlinx" }
60+
kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "org-jetbrains-kotlinx" }
61+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "org-jetbrains-kotlinx" }
62+
org-robolectric = "org.robolectric:robolectric:4.7.3"
63+
playservices-auth = "com.google.android.gms:play-services-auth:20.1.0"
64+
playservices-wearable = "com.google.android.gms:play-services-wearable:17.1.0"
65+
test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
66+
test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidx-test" }
67+
test-espresso-core = "androidx.test.espresso:espresso-core:3.4.0"
68+
test-ext-junit = "androidx.test.ext:junit:1.1.3"
69+
test-ext-junit-ktx = "androidx.test.ext:junit-ktx:1.1.3"
70+
test-ext-truth = "androidx.test.ext:truth:1.4.0"
71+
test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
72+
test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
73+
test-uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
74+
wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" }
75+
wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "androidx-wear-compose" }
76+
wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "androidx-wear-compose" }
77+
wear-phone-interactions = "androidx.wear:wear-phone-interactions:1.1.0-alpha02"
78+
wear-remote-interactions = "androidx.wear:wear-remote-interactions:1.0.0"
79+
wear-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "androidx-wear-tiles" }
80+
wear-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "androidx-wear-tiles" }
81+
wear-watchface = { module = "androidx.wear.watchface:watchface", version.ref = "androidx-wear-watchface" }
82+
wear-watchface-client = { module = "androidx.wear.watchface:watchface-client", version.ref = "androidx-wear-watchface" }
83+
wear-watchface-complications-data = { module = "androidx.wear.watchface:watchface-complications-data", version.ref = "androidx-wear-watchface" }
84+
wear-watchface-complications-data-source = { module = "androidx.wear.watchface:watchface-complications-data-source", version.ref = "androidx-wear-watchface" }
85+
wear-watchface-complications-rendering = { module = "androidx.wear.watchface:watchface-complications-rendering", version.ref = "androidx-wear-watchface" }
86+
wear-watchface-data = { module = "androidx.wear.watchface:watchface-data", version.ref = "androidx-wear-watchface" }
87+
wear-watchface-editor = { module = "androidx.wear.watchface:watchface-editor", version.ref = "androidx-wear-watchface" }
88+
wear-watchface-style = { module = "androidx.wear.watchface:watchface-style", version.ref = "androidx-wear-watchface" }
89+
90+
[plugins]
91+
android = "android:7.1.1"
92+
android-library = "android-library:7.1.1"
93+
android-reporting = "android-reporting:7.1.1"
94+
com-android-application = "com.android.application:7.1.1"
95+
com-android-asset-pack = "com.android.asset-pack:7.1.1"
96+
com-android-asset-pack-bundle = "com.android.asset-pack-bundle:7.1.1"
97+
com-android-base = "com.android.base:7.1.1"
98+
com-android-dynamic-feature = "com.android.dynamic-feature:7.1.1"
99+
com-android-internal-application = "com.android.internal.application:7.1.1"
100+
com-android-internal-asset-pack = "com.android.internal.asset-pack:7.1.1"
101+
com-android-internal-asset-pack-bundle = "com.android.internal.asset-pack-bundle:7.1.1"
102+
com-android-internal-dynamic-feature = "com.android.internal.dynamic-feature:7.1.1"
103+
com-android-internal-library = "com.android.internal.library:7.1.1"
104+
com-android-internal-reporting = "com.android.internal.reporting:7.1.1"
105+
com-android-internal-test = "com.android.internal.test:7.1.1"
106+
com-android-internal-version-check = "com.android.internal.version-check:7.1.1"
107+
com-android-library = "com.android.library:7.1.1"
108+
com-android-lint = "com.android.lint:7.1.1"
109+
com-android-reporting = "com.android.reporting:7.1.1"
110+
com-android-test = "com.android.test:7.1.1"
111+
com-diffplug-spotless = "com.diffplug.spotless:6.3.0"
112+
kotlin = "kotlin:1.6.10"
113+
kotlin-android = "kotlin-android:1.6.10"
114+
kotlin-android-extensions = "kotlin-android-extensions:1.6.10"
115+
kotlin-dce-js = "kotlin-dce-js:1.6.10"
116+
kotlin-kapt = "kotlin-kapt:1.6.10"
117+
kotlin-multiplatform = "kotlin-multiplatform:1.6.10"
118+
kotlin-native-cocoapods = "kotlin-native-cocoapods:1.6.10"
119+
kotlin-native-performance = "kotlin-native-performance:1.6.10"
120+
kotlin-parcelize = "kotlin-parcelize:1.6.10"
121+
kotlin-platform-android = "kotlin-platform-android:1.6.10"
122+
kotlin-platform-common = "kotlin-platform-common:1.6.10"
123+
kotlin-platform-js = "kotlin-platform-js:1.6.10"
124+
kotlin-platform-jvm = "kotlin-platform-jvm:1.6.10"
125+
kotlin-scripting = "kotlin-scripting:1.6.10"
126+
kotlin2js = "kotlin2js:1.6.10"
127+
org-jetbrains-kotlin-android = "org.jetbrains.kotlin.android:1.6.10"
128+
org-jetbrains-kotlin-android-extensions = "org.jetbrains.kotlin.android.extensions:1.6.10"
129+
org-jetbrains-kotlin-js = "org.jetbrains.kotlin.js:1.6.10"
130+
org-jetbrains-kotlin-jvm = "org.jetbrains.kotlin.jvm:1.6.10"
131+
org-jetbrains-kotlin-kapt = "org.jetbrains.kotlin.kapt:1.6.10"
132+
org-jetbrains-kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:1.6.10"
133+
org-jetbrains-kotlin-multiplatform-pm20 = "org.jetbrains.kotlin.multiplatform.pm20:1.6.10"
134+
org-jetbrains-kotlin-native-cocoapods = "org.jetbrains.kotlin.native.cocoapods:1.6.10"
135+
org-jetbrains-kotlin-native-performance = "org.jetbrains.kotlin.native.performance:1.6.10"
136+
org-jetbrains-kotlin-platform-android = "org.jetbrains.kotlin.platform.android:1.6.10"
137+
org-jetbrains-kotlin-platform-common = "org.jetbrains.kotlin.platform.common:1.6.10"
138+
org-jetbrains-kotlin-platform-js = "org.jetbrains.kotlin.platform.js:1.6.10"
139+
org-jetbrains-kotlin-platform-jvm = "org.jetbrains.kotlin.platform.jvm:1.6.10"
140+
org-jetbrains-kotlin-plugin-parcelize = "org.jetbrains.kotlin.plugin.parcelize:1.6.10"
141+
org-jetbrains-kotlin-plugin-scripting = "org.jetbrains.kotlin.plugin.scripting:1.6.10"

‎ComposeAdvanced/settings.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ dependencyResolutionManagement {
3030
google()
3131
mavenCentral()
3232
}
33-
versionCatalogs {
34-
libs {
35-
from(files("../gradle/libs.versions.toml"))
36-
}
37-
}
3833
}
3934

4035
rootProject.name = "ComposeAdvanced"

0 commit comments

Comments
 (0)