Skip to content

Commit 6c59a22

Browse files
authored
Merge pull request #21 from android/yaraki/ci
Enable GitHub Actions
2 parents 02bbded + 6cfabfc commit 6c59a22

File tree

5 files changed

+40
-5
lines changed

5 files changed

+40
-5
lines changed

Diff for: .github/workflows/build.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Pull Request
2+
3+
on:
4+
pull_request:
5+
types: [ opened, synchronize, reopened ]
6+
7+
permissions:
8+
contents: write
9+
actions: read
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
timeout-minutes: 60
15+
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
20+
- name: Validate Gradle Wrapper
21+
uses: gradle/wrapper-validation-action@v2
22+
23+
- name: Setup JDK
24+
uses: actions/setup-java@v4
25+
with:
26+
distribution: 'zulu'
27+
java-version: 17
28+
29+
- name: Setup Gradle
30+
uses: gradle/gradle-build-action@v3
31+
32+
- name: Check spotless
33+
run: ./gradlew spotlessCheck
34+
35+
- name: Build App
36+
run: ./gradlew :app:assembleDebug

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/.idea/navEditor.xml
1212
/.idea/assetWizardSettings.xml
1313
/.idea/deploymentTargetDropDown.xml
14+
/.idea/deploymentTargetSelector.xml
1415
/.idea/misc.xml
1516
/.idea/migrations.xml
1617
/.idea/gradle.xml

Diff for: app/src/main/java/com/google/android/samples/socialite/ui/Main.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import androidx.compose.animation.core.tween
2626
import androidx.compose.animation.fadeIn
2727
import androidx.compose.animation.fadeOut
2828
import androidx.compose.foundation.layout.fillMaxSize
29-
import androidx.compose.material3.Surface
3029
import androidx.compose.runtime.Composable
3130
import androidx.compose.ui.Modifier
3231
import androidx.compose.ui.platform.LocalContext
@@ -55,9 +54,7 @@ fun Main(
5554
) {
5655
val modifier = Modifier.fillMaxSize()
5756
SocialTheme {
58-
Surface(modifier = modifier) {
59-
MainNavigation(modifier, shortcutParams)
60-
}
57+
MainNavigation(modifier, shortcutParams)
6158
}
6259
}
6360

Diff for: app/src/main/java/com/google/android/samples/socialite/ui/home/Home.kt

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ fun Home(
6464
onDestinationChanged = { destination = it },
6565
)
6666
},
67+
containerColor = Color.Transparent,
6768
) { innerPadding ->
6869
val navController = rememberNavController()
6970
HomeBackground(modifier = Modifier.fillMaxSize())

Diff for: gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[versions]
1616
accompanist = "0.32.0"
1717
activity = "1.9.0-alpha01"
18-
agp = "8.2.1"
18+
agp = "8.2.2"
1919
benchmarkMacroJunit4 = "1.2.2"
2020
baselineprofile = "1.2.2"
2121
camera = "1.3.1"

0 commit comments

Comments
 (0)