Skip to content

Commit 2cff653

Browse files
yrezguiyrezgui
authored
Merge pull request android#308 from android/dev_alpha08
[All] Update to Compose 1.0.0-alpha08
2 parents e1ab50d + 03965b2 commit 2cff653

File tree

165 files changed

+1635
-1499
lines changed

Some content is hidden

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

165 files changed

+1635
-1499
lines changed

‎.github/workflows/Crane.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
@@ -73,10 +73,10 @@ jobs:
7373
- name: Copy CI gradle.properties
7474
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
7575

76-
- name: Set up JDK 1.8
76+
- name: Set up JDK 11
7777
uses: actions/setup-java@v1
7878
with:
79-
java-version: 1.8
79+
java-version: 11
8080

8181
- name: Generate cache key
8282
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

‎.github/workflows/JetNews.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
@@ -73,10 +73,10 @@ jobs:
7373
- name: Copy CI gradle.properties
7474
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
7575

76-
- name: Set up JDK 1.8
76+
- name: Set up JDK 11
7777
uses: actions/setup-java@v1
7878
with:
79-
java-version: 1.8
79+
java-version: 11
8080

8181
- name: Generate cache key
8282
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

‎.github/workflows/Jetcaster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

‎.github/workflows/Jetchat.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
@@ -73,10 +73,10 @@ jobs:
7373
- name: Copy CI gradle.properties
7474
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
7575

76-
- name: Set up JDK 1.8
76+
- name: Set up JDK 11
7777
uses: actions/setup-java@v1
7878
with:
79-
java-version: 1.8
79+
java-version: 11
8080

8181
- name: Generate cache key
8282
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

‎.github/workflows/Jetsnack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

‎.github/workflows/Jetsurvey.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

‎.github/workflows/Owl.yaml

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
@@ -57,3 +57,50 @@ jobs:
5757
with:
5858
name: build-reports
5959
path: ${{ env.SAMPLE_PATH }}/app/build/reports
60+
61+
test:
62+
needs: build
63+
runs-on: macOS-latest # enables hardware acceleration in the virtual machine
64+
timeout-minutes: 30
65+
strategy:
66+
matrix:
67+
api-level: [23, 26, 29]
68+
69+
steps:
70+
- name: Checkout
71+
uses: actions/checkout@v2
72+
73+
- name: Copy CI gradle.properties
74+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
75+
76+
- name: Set up JDK 11
77+
uses: actions/setup-java@v1
78+
with:
79+
java-version: 11
80+
81+
- name: Generate cache key
82+
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
83+
84+
- uses: actions/cache@v2
85+
with:
86+
path: |
87+
~/.gradle/caches/modules-*
88+
~/.gradle/caches/jars-*
89+
~/.gradle/caches/build-cache-*
90+
key: gradle-${{ hashFiles('checksum.txt') }}
91+
92+
- name: Run instrumentation tests
93+
uses: reactivecircus/android-emulator-runner@v2
94+
with:
95+
api-level: ${{ matrix.api-level }}
96+
arch: x86
97+
disable-animations: true
98+
script: ./gradlew connectedCheck --stacktrace
99+
working-directory: ${{ env.SAMPLE_PATH }}
100+
101+
- name: Upload test reports
102+
if: always()
103+
uses: actions/upload-artifact@v2
104+
with:
105+
name: test-reports
106+
path: ${{ env.SAMPLE_PATH }}/app/build/reports

‎.github/workflows/Rally.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Copy CI gradle.properties
2626
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2727

28-
- name: Set up JDK 1.8
28+
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 1.8
31+
java-version: 11
3232

3333
- name: Generate cache key
3434
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

‎.github/workflows/Release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- name: Copy CI gradle.properties
1818
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
1919

20-
- name: Set up JDK 1.8
20+
- name: Set up JDK 11
2121
uses: actions/setup-java@v1
2222
with:
23-
java-version: 1.8
23+
java-version: 11
2424

2525
- name: Build all projects
2626
run: ./scripts/gradlew_recursive.sh assembleDebug

‎Crane/app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ android {
6565
}
6666

6767
release {
68-
minifyEnabled false
68+
minifyEnabled true
6969
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
7070
}
7171
}
@@ -106,15 +106,16 @@ android {
106106
dependencies {
107107
implementation Libs.Kotlin.stdlib
108108
implementation Libs.Kotlin.Coroutines.android
109-
implementation Libs.googleMaps
109+
implementation Libs.GoogleMaps.maps
110+
implementation Libs.GoogleMaps.mapsKtx
110111

111112
implementation Libs.AndroidX.Compose.runtime
112113
implementation Libs.AndroidX.Compose.runtimeLivedata
113114
implementation Libs.AndroidX.Compose.foundation
114115
implementation Libs.AndroidX.Compose.material
115116
implementation Libs.AndroidX.Compose.layout
116117
implementation Libs.AndroidX.Compose.animation
117-
implementation Libs.AndroidX.UI.tooling
118+
implementation Libs.AndroidX.Compose.tooling
118119
implementation Libs.Accompanist.coil
119120

120121
implementation Libs.AndroidX.Lifecycle.viewModelKtx

‎Crane/app/proguard-rules.pro

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎Crane/app/src/androidTest/java/androidx/compose/samples/crane/details/DetailsActivityTest.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,21 @@ class DetailsActivityTest {
5858

5959
@get:Rule(order = 1)
6060
val composeTestRule = AndroidComposeTestRule(
61-
ActivityScenarioRule<DetailsActivity>(
61+
activityRule = ActivityScenarioRule<DetailsActivity>(
6262
createDetailsActivityIntent(
6363
InstrumentationRegistry.getInstrumentation().targetContext,
6464
testExploreModel
6565
)
66-
)
66+
),
67+
// Needed for now, discussed in https://issuetracker.google.com/issues/174472899
68+
activityProvider = { rule ->
69+
var activity: DetailsActivity? = null
70+
rule.scenario.onActivity { activity = it }
71+
if (activity == null) {
72+
throw IllegalStateException("Activity was not set in the ActivityScenarioRule!")
73+
}
74+
activity!!
75+
}
6776
)
6877

6978
@Before

‎Crane/app/src/androidTest/java/androidx/compose/samples/crane/di/TestDispatchersModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ package androidx.compose.samples.crane.di
2121
import dagger.Module
2222
import dagger.Provides
2323
import dagger.hilt.InstallIn
24-
import dagger.hilt.android.components.ApplicationComponent
24+
import dagger.hilt.components.SingletonComponent
2525
import kotlinx.coroutines.CoroutineDispatcher
2626
import kotlinx.coroutines.Dispatchers
2727
import kotlinx.coroutines.ExperimentalCoroutinesApi
2828

2929
@OptIn(ExperimentalCoroutinesApi::class)
3030
@Module
31-
@InstallIn(ApplicationComponent::class)
31+
@InstallIn(SingletonComponent::class)
3232
class TestDispatchersModule {
3333

3434
@Provides

‎Crane/app/src/main/AndroidManifest.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@
2020

2121
<uses-permission android:name="android.permission.INTERNET" />
2222

23+
<!--
24+
Android 11 package visibility changes require that apps specify which
25+
set of other packages on the device that they can access. Since this
26+
sample uses Google Maps, specifying the Google Maps package name is
27+
required so that the buttons on the Map toolbar launch the Google Maps app.
28+
-->
29+
<queries>
30+
<package android:name="com.google.android.apps.maps" />
31+
</queries>
32+
2333
<application
2434
android:name=".CraneApplication"
2535
android:allowBackup="true"
@@ -42,4 +52,4 @@
4252
<activity android:name=".calendar.CalendarActivity" />
4353
</application>
4454

45-
</manifest>
55+
</manifest>

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/BaseUserInput.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import androidx.compose.ui.Modifier
4141
import androidx.compose.ui.graphics.Color
4242
import androidx.compose.ui.res.vectorResource
4343
import androidx.compose.ui.text.input.TextFieldValue
44+
import androidx.compose.ui.tooling.preview.Preview
4445
import androidx.compose.ui.unit.dp
45-
import androidx.ui.tooling.preview.Preview
4646

4747
@Composable
4848
fun SimpleUserInput(
@@ -124,7 +124,7 @@ private fun CraneBaseUserInput(
124124
if (vectorImageId != null) {
125125
Icon(
126126
modifier = Modifier.preferredSize(24.dp, 24.dp),
127-
asset = vectorResource(id = vectorImageId),
127+
imageVector = vectorResource(id = vectorImageId),
128128
tint = if (tintIcon()) tint else Color(0x80FFFFFF)
129129
)
130130
Spacer(Modifier.preferredWidth(8.dp))

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/CraneDrawer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ import androidx.compose.samples.crane.R
2929
import androidx.compose.samples.crane.ui.CraneTheme
3030
import androidx.compose.ui.Modifier
3131
import androidx.compose.ui.res.vectorResource
32+
import androidx.compose.ui.tooling.preview.Preview
3233
import androidx.compose.ui.unit.dp
33-
import androidx.ui.tooling.preview.Preview
3434

3535
private val screens = listOf("Find Trips", "My Trips", "Saved Trips", "Price Alerts", "My Account")
3636

3737
@Composable
3838
fun CraneDrawer(modifier: Modifier = Modifier) {
3939
Column(modifier.fillMaxSize().padding(start = 24.dp, top = 48.dp)) {
40-
Image(asset = vectorResource(id = R.drawable.ic_crane_drawer))
40+
Image(imageVector = vectorResource(id = R.drawable.ic_crane_drawer))
4141
for (screen in screens) {
4242
Spacer(Modifier.preferredHeight(24.dp))
4343
Text(text = screen, style = MaterialTheme.typography.h4)

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/CraneTabs.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import androidx.compose.samples.crane.home.CraneScreen
3636
import androidx.compose.ui.Alignment
3737
import androidx.compose.ui.Modifier
3838
import androidx.compose.ui.graphics.Color
39-
import androidx.compose.ui.platform.ConfigurationAmbient
39+
import androidx.compose.ui.platform.AmbientConfiguration
4040
import androidx.compose.ui.res.vectorResource
4141
import androidx.compose.ui.unit.dp
4242
import androidx.core.os.ConfigurationCompat
@@ -52,10 +52,10 @@ fun CraneTabBar(
5252
Row(Modifier.padding(top = 8.dp)) {
5353
Image(
5454
modifier = Modifier.padding(top = 8.dp).clickable(onClick = onMenuClicked),
55-
asset = vectorResource(id = R.drawable.ic_menu)
55+
imageVector = vectorResource(id = R.drawable.ic_menu)
5656
)
5757
Spacer(Modifier.preferredWidth(8.dp))
58-
Image(asset = vectorResource(id = R.drawable.ic_crane_logo))
58+
Image(imageVector = vectorResource(id = R.drawable.ic_crane_logo))
5959
}
6060
children(Modifier.weight(1f).align(Alignment.CenterVertically))
6161
}
@@ -93,7 +93,7 @@ fun CraneTabs(
9393
Text(
9494
modifier = textModifier,
9595
text = title.toUpperCase(
96-
ConfigurationCompat.getLocales(ConfigurationAmbient.current)[0]
96+
ConfigurationCompat.getLocales(AmbientConfiguration.current)[0]
9797
)
9898
)
9999
}

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private fun ExploreItem(
9797
Box(Modifier.fillMaxSize()) {
9898
Image(
9999
modifier = Modifier.preferredSize(36.dp).align(Alignment.Center),
100-
asset = vectorResource(id = R.drawable.ic_crane_logo)
100+
imageVector = vectorResource(id = R.drawable.ic_crane_logo)
101101
)
102102
}
103103
}

0 commit comments

Comments
 (0)