diff --git a/.github/workflows/publish-to-play-store-beta.yml b/.github/workflows/publish-to-play-store-beta.yml index 505238f..d4603b5 100644 --- a/.github/workflows/publish-to-play-store-beta.yml +++ b/.github/workflows/publish-to-play-store-beta.yml @@ -15,16 +15,27 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up Java 17 uses: actions/setup-java@v3 with: java-version: '17' distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: wrapper + cache-read-only: false + - name: Create secrets.properties run: | echo "${{ secrets.SECRETS_PROPERTIES }}" > secrets.properties + - name: Load Google Service file + env: + DATA: ${{ secrets.GOOGLE_SERVICES_JSON }} + run: echo $DATA | base64 -di > app/google-services.json + - name: Build with Gradle id: build run: ./gradlew build diff --git a/.github/workflows/publish-to-play-store.yml b/.github/workflows/publish-to-play-store.yml index 471cfb9..e791c02 100644 --- a/.github/workflows/publish-to-play-store.yml +++ b/.github/workflows/publish-to-play-store.yml @@ -15,16 +15,27 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up Java 17 uses: actions/setup-java@v3 with: java-version: '17' distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: wrapper + cache-read-only: false + - name: Create secrets.properties run: | echo "${{ secrets.SECRETS_PROPERTIES }}" > secrets.properties + - name: Load Google Service file + env: + DATA: ${{ secrets.GOOGLE_SERVICES_JSON }} + run: echo $DATA | base64 -di > app/google-services.json + - name: Build with Gradle id: build run: ./gradlew build diff --git a/app/build.gradle b/app/build.gradle index e613d33..bac53ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "com.cornellappdev.android.eatery" minSdk 28 targetSdk 34 - versionCode 69 - versionName "blue-1.0.1-crashfix" + versionCode 71 + versionName "1.1-compare-menus" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -44,7 +44,6 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.debug } } @@ -96,7 +95,6 @@ dependencies { implementation("androidx.navigation:navigation-fragment-ktx:$nav_version") implementation("androidx.navigation:navigation-ui-ktx:$nav_version") implementation("androidx.navigation:navigation-compose:2.6.0-alpha04") - implementation("androidx.navigation:navigation-dynamic-features-fragment:$nav_version") implementation 'androidx.compose.material:material-icons-core:1.3.1' implementation 'androidx.compose.material:material-icons-extended:1.3.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4' diff --git a/gradle.properties b/gradle.properties index 2cbd6d1..41ac391 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,3 +21,4 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true +org.gradle.caching=true diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US index 6dbb3c0..a150f11 100644 --- a/whatsnew/whatsnew-en-US +++ b/whatsnew/whatsnew-en-US @@ -1 +1,4 @@ -We're working hard to bring you the latest fixes and features to Eatery! +We're working hard to bring you the latest fixes and features to Eatery! Here's what we've been working on: +* Compare Menus - Click the Compare Menus button on the main menu or eatery detail screen to compare menus across several eateries! +* Home Screen UI Reorganization - Eateries nearest to you are now more intuitive to find. +* Menu Selection - Select the top bar on a eatery menu to swap from breakfast, lunch, and dinner!