Compare commits
3 Commits
3c83f740d4
...
0.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
c4e6d6b69f
|
|||
|
9ecfcc2a74
|
|||
|
f5db153ac2
|
91
.github/workflows/check.yml
vendored
91
.github/workflows/check.yml
vendored
@@ -1,91 +0,0 @@
|
|||||||
name: Check
|
|
||||||
|
|
||||||
on: [ pull_request ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
check:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
|
|
||||||
with:
|
|
||||||
fastlaneDir: ./fastlane/metadata/android
|
|
||||||
usePlayStoreLocales: true
|
|
||||||
|
|
||||||
- uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: temurin
|
|
||||||
java-version: 17
|
|
||||||
|
|
||||||
- name: Setup Gradle
|
|
||||||
uses: gradle/actions/setup-gradle@v4
|
|
||||||
|
|
||||||
- name: Setup Android SDK
|
|
||||||
uses: android-actions/setup-android@v3
|
|
||||||
|
|
||||||
- name: Checks
|
|
||||||
run: ./gradlew check :app:koverXmlReportRelease :app:koverVerifyRelease
|
|
||||||
|
|
||||||
- name: SonarCloud
|
|
||||||
env:
|
|
||||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
|
||||||
run: ./gradlew sonar
|
|
||||||
|
|
||||||
- name: Publish test reports
|
|
||||||
uses: mikepenz/action-junit-report@v4
|
|
||||||
if: always() # always run even if the previous step fails
|
|
||||||
with:
|
|
||||||
report_paths: './**/build/test-results/**/TEST-*.xml'
|
|
||||||
|
|
||||||
uiTests:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
api-level: [ 30 ]
|
|
||||||
steps:
|
|
||||||
- name: Free Disk Space (Ubuntu)
|
|
||||||
uses: jlumbroso/free-disk-space@v1.3.1
|
|
||||||
with:
|
|
||||||
android: false
|
|
||||||
large-packages: true
|
|
||||||
tool-cache: true
|
|
||||||
dotnet: true
|
|
||||||
haskell: true
|
|
||||||
docker-images: true
|
|
||||||
swap-storage: true
|
|
||||||
|
|
||||||
- name: Enable KVM group perms
|
|
||||||
run: |
|
|
||||||
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
|
|
||||||
sudo udevadm control --reload-rules
|
|
||||||
sudo udevadm trigger --name-match=kvm
|
|
||||||
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
name: Checkout the code
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- uses: actions/setup-java@v4
|
|
||||||
name: Setup JDK 17
|
|
||||||
with:
|
|
||||||
distribution: 'zulu'
|
|
||||||
java-version: 17
|
|
||||||
|
|
||||||
- name: Setup Gradle
|
|
||||||
uses: gradle/actions/setup-gradle@v4
|
|
||||||
with:
|
|
||||||
validate-wrappers: true
|
|
||||||
gradle-home-cache-cleanup: true
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
uses: reactivecircus/android-emulator-runner@v2
|
|
||||||
with:
|
|
||||||
api-level: ${{ matrix.api-level }}
|
|
||||||
arch: x86_64
|
|
||||||
disable-animations: true
|
|
||||||
disk-size: 6000M
|
|
||||||
heap-size: 600M
|
|
||||||
script: ./gradlew :app:connectedCheck
|
|
||||||
61
.github/workflows/sign.yml
vendored
61
.github/workflows/sign.yml
vendored
@@ -1,61 +0,0 @@
|
|||||||
name: Sign
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
sign:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: temurin
|
|
||||||
java-version: 17
|
|
||||||
|
|
||||||
- name: Setup Gradle
|
|
||||||
uses: gradle/gradle-build-action@v3
|
|
||||||
|
|
||||||
- name: Setup Android SDK
|
|
||||||
uses: android-actions/setup-android@v3
|
|
||||||
|
|
||||||
- name: Restore keystore
|
|
||||||
env:
|
|
||||||
MEALIENT_KEY_STORE: ${{ secrets.MEALIENT_KEY_STORE }}
|
|
||||||
MEALIENT_KEY_STORE_PASSWORD: ${{ secrets.MEALIENT_KEY_STORE_PASSWORD }}
|
|
||||||
MEALIENT_KEY_ALIAS: ${{ secrets.MEALIENT_KEY_ALIAS }}
|
|
||||||
MEALIENT_KEY_PASSWORD: ${{ secrets.MEALIENT_KEY_PASSWORD }}
|
|
||||||
run: |
|
|
||||||
echo "$MEALIENT_KEY_STORE" | base64 -d > app/keystore.jks
|
|
||||||
echo "storeFile=keystore.jks" > keystore.properties
|
|
||||||
echo "storePassword=$MEALIENT_KEY_STORE_PASSWORD" >> keystore.properties
|
|
||||||
echo "keyAlias=$MEALIENT_KEY_ALIAS" >> keystore.properties
|
|
||||||
echo "keyPassword=$MEALIENT_KEY_PASSWORD" >> keystore.properties
|
|
||||||
|
|
||||||
- name: APK
|
|
||||||
run: |
|
|
||||||
./gradlew build
|
|
||||||
cp app/build/outputs/apk/release/*.apk mealient-release.apk
|
|
||||||
|
|
||||||
- name: Bundle
|
|
||||||
run: |
|
|
||||||
./gradlew bundle
|
|
||||||
cp app/build/outputs/bundle/release/*.aab mealient-release.aab
|
|
||||||
|
|
||||||
- name: Upload release build
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: Release build
|
|
||||||
path: |
|
|
||||||
mealient-release.apk
|
|
||||||
mealient-release.aab
|
|
||||||
|
|
||||||
- name: SonarCloud
|
|
||||||
env:
|
|
||||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
|
||||||
run: ./gradlew sonar
|
|
||||||
@@ -14,7 +14,7 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "com.atridad.mealient"
|
applicationId = "com.atridad.mealient"
|
||||||
versionCode = 37
|
versionCode = 37
|
||||||
versionName = "0.4.8"
|
versionName = "0.5.0"
|
||||||
testInstrumentationRunner = "com.atridad.mealient.MealientTestRunner"
|
testInstrumentationRunner = "com.atridad.mealient.MealientTestRunner"
|
||||||
testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true")
|
testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true")
|
||||||
resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de")
|
resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de")
|
||||||
|
|||||||
BIN
app/release/Mealient.apk
Normal file
BIN
app/release/Mealient.apk
Normal file
Binary file not shown.
BIN
app/release/baselineProfiles/0/app-release.dm
Normal file
BIN
app/release/baselineProfiles/0/app-release.dm
Normal file
Binary file not shown.
BIN
app/release/baselineProfiles/1/app-release.dm
Normal file
BIN
app/release/baselineProfiles/1/app-release.dm
Normal file
Binary file not shown.
37
app/release/output-metadata.json
Normal file
37
app/release/output-metadata.json
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{
|
||||||
|
"version": 3,
|
||||||
|
"artifactType": {
|
||||||
|
"type": "APK",
|
||||||
|
"kind": "Directory"
|
||||||
|
},
|
||||||
|
"applicationId": "com.atridad.mealient",
|
||||||
|
"variantName": "release",
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"type": "SINGLE",
|
||||||
|
"filters": [],
|
||||||
|
"attributes": [],
|
||||||
|
"versionCode": 37,
|
||||||
|
"versionName": "0.5.0",
|
||||||
|
"outputFile": "app-release.apk"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"elementType": "File",
|
||||||
|
"baselineProfiles": [
|
||||||
|
{
|
||||||
|
"minApi": 28,
|
||||||
|
"maxApi": 30,
|
||||||
|
"baselineProfiles": [
|
||||||
|
"baselineProfiles/1/app-release.dm"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"minApi": 31,
|
||||||
|
"maxApi": 2147483647,
|
||||||
|
"baselineProfiles": [
|
||||||
|
"baselineProfiles/0/app-release.dm"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"minSdkVersionForDexing": 26
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
|
|
||||||
option java_package = "gq.kirmanak.mealient.datastore.recipe";
|
option java_package = "com.atridad.mealient.datastore.recipe";
|
||||||
option java_multiple_files = true;
|
option java_multiple_files = true;
|
||||||
|
|
||||||
message AddRecipeInput {
|
message AddRecipeInput {
|
||||||
@@ -11,4 +11,4 @@ message AddRecipeInput {
|
|||||||
repeated string recipeIngredients = 5;
|
repeated string recipeIngredients = 5;
|
||||||
bool isRecipePublic = 6;
|
bool isRecipePublic = 6;
|
||||||
bool areCommentsDisabled = 7;
|
bool areCommentsDisabled = 7;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "com.atridad.mealient.shopping_lists"
|
namespace = "com.atridad.mealient.shopping_list"
|
||||||
}
|
}
|
||||||
|
|
||||||
ksp {
|
ksp {
|
||||||
|
|||||||
Reference in New Issue
Block a user