Skip to content

Commit b11912c

Browse files
igordmnigordmn
committed
Revert "Comment project dependencies in android* source sets"
This reverts commit d4364fc.
1 parent ccda85a commit b11912c

File tree

91 files changed

+440
-440
lines changed

Some content is hidden

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

91 files changed

+440
-440
lines changed

‎compose/animation/animation-core-lint/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ BundleInsideHelper.forInsideLintJar(project)
3434
dependencies {
3535
compileOnly libs.androidLintMinApi
3636
compileOnly libs.kotlinStdlib
37-
//bundleInside(project(":compose:lint:common"))
37+
bundleInside(project(":compose:lint:common"))
3838

39-
//testImplementation(project(":compose:lint:common-test"))
39+
testImplementation(project(":compose:lint:common-test"))
4040
testImplementation libs.kotlinStdlib
4141
testImplementation libs.androidLint
4242
testImplementation libs.androidLintTests

‎compose/animation/animation-core/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ androidXMultiplatform {
7777
implementation(libs.testCore)
7878
implementation(libs.junit)
7979
implementation(libs.truth)
80-
//implementation(project(":compose:animation:animation"))
81-
//implementation(project(":compose:foundation:foundation"))
80+
implementation(project(":compose:animation:animation"))
81+
implementation(project(":compose:foundation:foundation"))
8282
implementation("androidx.compose.ui:ui-test-junit4:1.2.1")
83-
//implementation(project(":compose:test-utils"))
83+
implementation(project(":compose:test-utils"))
8484
implementation("androidx.compose.material3:material3:1.2.1")
8585
implementation(libs.leakcanary)
8686
implementation(libs.leakcanaryInstrumentation)
@@ -130,13 +130,13 @@ androidXMultiplatform {
130130
}
131131

132132
dependencies {
133-
//lintPublish(project(":compose:animation:animation-core-lint"))
133+
lintPublish(project(":compose:animation:animation-core-lint"))
134134
}
135135

136136
androidx {
137137
name = "Compose Animation Core"
138138
type = SoftwareType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
139139
inceptionYear = "2019"
140140
description = "Animation engine and animation primitives that are the building blocks of the Compose animation library"
141-
//samples(project(":compose:animation:animation-core:animation-core-samples"))
141+
samples(project(":compose:animation:animation-core:animation-core-samples"))
142142
}

‎compose/animation/animation-core/samples/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ plugins {
3232
}
3333

3434
dependencies {
35-
//compileOnly(project(":annotation:annotation-sampled"))
36-
//implementation(project(":compose:animation:animation"))
37-
//implementation(project(":compose:animation:animation-core"))
38-
//implementation(project(":compose:runtime:runtime"))
39-
//implementation(project(":compose:ui:ui"))
35+
compileOnly(project(":annotation:annotation-sampled"))
36+
implementation(project(":compose:animation:animation"))
37+
implementation(project(":compose:animation:animation-core"))
38+
implementation(project(":compose:runtime:runtime"))
39+
implementation(project(":compose:ui:ui"))
4040
implementation("androidx.compose.ui:ui-unit:1.2.1")
4141
implementation("androidx.compose.foundation:foundation:1.2.1")
4242
implementation("androidx.compose.foundation:foundation-layout:1.2.1")

‎compose/animation/animation-graphics/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ androidXMultiplatform {
7474
implementation(libs.truth)
7575
implementation("androidx.compose.foundation:foundation:1.2.1")
7676
implementation("androidx.compose.ui:ui-test-junit4:1.2.1")
77-
//implementation(project(":compose:test-utils"))
77+
implementation(project(":compose:test-utils"))
7878
}
7979

8080
androidHostTest.dependencies {
@@ -90,5 +90,5 @@ androidx {
9090
type = SoftwareType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
9191
inceptionYear = "2021"
9292
description = "Compose Animation Graphics Library for using animated-vector resources in Compose"
93-
//samples(project(":compose:animation:animation-graphics:animation-graphics-samples"))
93+
samples(project(":compose:animation:animation-graphics:animation-graphics-samples"))
9494
}

‎compose/animation/animation-graphics/samples/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ plugins {
3434
dependencies {
3535

3636

37-
//compileOnly(project(":annotation:annotation-sampled"))
37+
compileOnly(project(":annotation:annotation-sampled"))
3838

39-
//implementation(project(":compose:animation:animation"))
40-
//implementation(project(":compose:animation:animation-graphics"))
39+
implementation(project(":compose:animation:animation"))
40+
implementation(project(":compose:animation:animation-graphics"))
4141
implementation("androidx.compose.foundation:foundation:1.2.1")
4242
implementation("androidx.compose.material:material:1.2.1")
4343
implementation("androidx.compose.runtime:runtime:1.2.1")

‎compose/animation/animation-lint/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ BundleInsideHelper.forInsideLintJar(project)
3434
dependencies {
3535
compileOnly libs.androidLintMinApi
3636
compileOnly libs.kotlinStdlib
37-
//bundleInside(project(":compose:lint:common"))
37+
bundleInside(project(":compose:lint:common"))
3838

39-
//testImplementation(project(":compose:lint:common-test"))
39+
testImplementation(project(":compose:lint:common-test"))
4040
testImplementation libs.kotlinStdlib
4141
testImplementation libs.androidLint
4242
testImplementation libs.androidLintTests

‎compose/animation/animation/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ androidXMultiplatform {
8080
implementation(libs.truth)
8181
implementation(libs.leakcanary)
8282
implementation(libs.leakcanaryInstrumentation)
83-
//implementation(project(":compose:foundation:foundation"))
84-
//implementation(project(":compose:material3:material3"))
83+
implementation(project(":compose:foundation:foundation"))
84+
implementation(project(":compose:material3:material3"))
8585
implementation("androidx.compose.ui:ui-test-junit4:1.2.1")
86-
//implementation(project(":compose:test-utils"))
86+
implementation(project(":compose:test-utils"))
8787
}
8888

8989
androidHostTest.dependencies {
@@ -127,13 +127,13 @@ androidXMultiplatform {
127127
}
128128

129129
dependencies {
130-
//lintPublish(project(":compose:animation:animation-lint"))
130+
lintPublish(project(":compose:animation:animation-lint"))
131131
}
132132

133133
androidx {
134134
name = "Compose Animation"
135135
type = SoftwareType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
136136
inceptionYear = "2019"
137137
description = "Compose animation library"
138-
//samples(project(":compose:animation:animation:animation-samples"))
138+
samples(project(":compose:animation:animation:animation-samples"))
139139
}

‎compose/animation/animation/integration-tests/animation-demos/build.gradle‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ plugins {
1616

1717
dependencies {
1818

19-
//implementation(project(":compose:foundation:foundation-layout"))
20-
//implementation(project(":compose:integration-tests:demos:common"))
21-
//implementation(project(":compose:runtime:runtime"))
22-
//implementation(project(":compose:ui:ui"))
23-
//implementation(project(":compose:ui:ui-text"))
24-
//implementation(project(":compose:animation:animation"))
25-
//implementation(project(":compose:animation:animation-graphics"))
26-
//implementation(project(":compose:ui:ui:ui-samples"))
27-
//implementation(project(":compose:animation:animation:animation-samples"))
28-
//implementation(project(":compose:animation:animation-core:animation-core-samples"))
29-
//implementation(project(":compose:foundation:foundation"))
30-
//implementation(project(":compose:material:material"))
19+
implementation(project(":compose:foundation:foundation-layout"))
20+
implementation(project(":compose:integration-tests:demos:common"))
21+
implementation(project(":compose:runtime:runtime"))
22+
implementation(project(":compose:ui:ui"))
23+
implementation(project(":compose:ui:ui-text"))
24+
implementation(project(":compose:animation:animation"))
25+
implementation(project(":compose:animation:animation-graphics"))
26+
implementation(project(":compose:ui:ui:ui-samples"))
27+
implementation(project(":compose:animation:animation:animation-samples"))
28+
implementation(project(":compose:animation:animation-core:animation-core-samples"))
29+
implementation(project(":compose:foundation:foundation"))
30+
implementation(project(":compose:material:material"))
3131
implementation("androidx.compose.material:material-icons-core:1.6.7")
32-
//implementation(project(":compose:ui:ui-tooling-preview"))
33-
//implementation(project(":compose:material3:material3"))
34-
//implementation(project(":navigation:navigation-compose"))
35-
//implementation(project(":compose:ui:ui-tooling"))
32+
implementation(project(":compose:ui:ui-tooling-preview"))
33+
implementation(project(":compose:material3:material3"))
34+
implementation(project(":navigation:navigation-compose"))
35+
implementation(project(":compose:ui:ui-tooling"))
3636
}
3737

3838
android {

‎compose/animation/animation/samples/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ plugins {
3333

3434
dependencies {
3535

36-
//compileOnly(project(":annotation:annotation-sampled"))
36+
compileOnly(project(":annotation:annotation-sampled"))
3737

38-
//implementation(project(":compose:animation:animation"))
38+
implementation(project(":compose:animation:animation"))
3939
implementation("androidx.compose.foundation:foundation:1.6.8")
4040
implementation("androidx.compose.material:material:1.6.8")
4141
implementation("androidx.compose.material:material-icons-core:1.6.8")

‎compose/desktop/desktop/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ androidXMultiplatform {
4646
dependencies {
4747
implementation(libs.kotlinCoroutinesTest)
4848
implementation(libs.skikoCurrentOs)
49-
//implementation(project(":compose:ui:ui-test-junit4"))
49+
implementation(project(":compose:ui:ui-test-junit4"))
5050
implementation(libs.junit)
5151
implementation(libs.truth)
5252
}

0 commit comments

Comments
 (0)