Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare alpha release #1385

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
id: gradle_build
env:
FIREBASE_ANDROID_APP_ID: ${{ secrets.firebase_android_app_id }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GOOGLE_SERVICE_ACCOUNT_ID: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_ID }}
INTEGRATION_API_KEY: ${{ secrets.integration_api_key }}
run: ./gradlew cloud-run:integrationTest --console=plain
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,15 @@ jobs:
:conferences-app:bundle \
--console=plain
env:
# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }}
# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }}
ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }}
BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }}
KEY_STORE_FILE: keystore.jks
KEY_STORE_PASSWORD: ${{ steps.op-secrets.outputs.KEYSTORE_PASSWORD }}
RELEASE_KEY_ALIAS: ${{ steps.op-secrets.outputs.KEY_ALIAS }}
RELEASE_KEY_PASSWORD: ${{ steps.op-secrets.outputs.KEY_PASSWORD }}
# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }}
VERSION_CODE: ${{ steps.version-code.outputs.VERSION_CODE }}

- run: ./gradlew validateScreenshotTest --console=plain
# env:
# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }}
# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }}
# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }}

- uses: actions/upload-artifact@v4
with:
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,9 @@ jobs:

- id: gradle
run: ./gradlew build --console=plain
# env:
# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }}
# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }}

- id: screenshot-validation
run: ./gradlew validateScreenshotTest --console=plain
# env:
# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }}
# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }}
# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }}

- uses: actions/upload-artifact@v4
if: failure() && steps.screenshot-validation.outcome == 'failure'
Expand Down
2 changes: 1 addition & 1 deletion conferences-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ android {
versionCode = value?.toInt() ?: 1
}

versionName = "1.0.0"
versionName = "1.0.0-$versionCode"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import androidx.compose.material3.SuggestionChip
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
Expand All @@ -44,7 +42,6 @@ import androidx.compose.ui.unit.dp
import coil3.compose.AsyncImage
import io.ashdavies.analytics.OnClick
import io.ashdavies.paging.LazyPagingItems
import io.ashdavies.party.material.LocalWindowSizeClass
import io.ashdavies.placeholder.PlaceholderHighlight
import io.ashdavies.placeholder.fade
import io.ashdavies.placeholder.placeholder
Expand Down Expand Up @@ -137,7 +134,6 @@ private fun EventSection(
private fun EventSectionContent(
event: Event?,
modifier: Modifier = Modifier,
windowClassSize: WindowSizeClass = LocalWindowSizeClass.current,
) {
Box(modifier.height(IntrinsicSize.Min)) {
if (event?.imageUrl != null) {
Expand All @@ -162,15 +158,6 @@ private fun EventSectionContent(
text = event?.name,
style = MaterialTheme.typography.headlineSmall,
)

if (windowClassSize.widthSizeClass == WindowWidthSizeClass.Expanded) {
EventStatusChips(
cfpSite = event?.cfpSite,
cfpEnd = event?.cfpEnd,
isOnlineOnly = event?.online == true,
modifier = Modifier.padding(start = 12.dp),
)
}
}

PlaceholderText(
Expand All @@ -179,13 +166,11 @@ private fun EventSectionContent(
style = MaterialTheme.typography.titleSmall,
)

if (windowClassSize.widthSizeClass == WindowWidthSizeClass.Compact) {
EventStatusChips(
cfpSite = event?.cfpSite,
cfpEnd = event?.cfpEnd,
isOnlineOnly = event?.online == true,
)
}
EventStatusChips(
cfpSite = event?.cfpSite,
cfpEnd = event?.cfpEnd,
isOnlineOnly = event?.online == true,
)
}

if (event?.dateStart != null) {
Expand Down
1 change: 0 additions & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ platform :android do
lane :publish_to_play_store do
upload_to_play_store(
package_name: "io.ashdavies.playground",
release_status: "draft",
track: "internal",
json_key: "conferences-app/src/androidMain/play-store-key.json",
aab: "conferences-app/build/outputs/bundle/release/conferences-app-release.aab",
Expand Down
Empty file.
Empty file.
1 change: 0 additions & 1 deletion fastlane/metadata/android/en-GB/title.txt

This file was deleted.

Empty file.
Loading