From 97c94ca307c9939c8c904e05819dee2e382db7b5 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Mon, 13 Jun 2022 20:09:50 +0200 Subject: [PATCH 1/3] Fix min sdk version --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index e7674fe..6a260cd 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -32,7 +32,7 @@ ext { appsweep_version = "1.0.0" compile_sdk_version = 32 - min_sdk_version = 32 + min_sdk_version = 23 target_sdk_version = 32 // https://github.com/material-components/material-components-android/releases From de6416fb1a105f19655ea7adf5c862647a533dae Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Mon, 13 Jun 2022 20:10:06 +0200 Subject: [PATCH 2/3] Remove unused gitlab ci --- .gitlab-ci.yml | 53 -------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index ff4992d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,53 +0,0 @@ -image: androidsdk/android-30 - -before_script: - # Ask gradle to put everything to .gradle dir so that we can cache it - - export GRADLE_USER_HOME=`pwd`/.gradle - -cache: - paths: - - .gradle - -stages: - - check - - build - -assembleDebug: - interruptible: true - stage: build - needs: [ ] - script: - - ./gradlew assembleDebug - - cp app/build/outputs/apk/debug/*.apk mealient-debug.apk - artifacts: - paths: - - mealient-debug.apk - -checkApp: - interruptible: true - stage: check - needs: [ ] - script: - - ./gradlew check - artifacts: - when: always - reports: - junit: ./**/build/test-results/**/TEST-*.xml - -assembleRelease: - interruptible: true - stage: build - needs: [ "checkApp" ] - script: - - echo "$MEALIE_KEY_STORE" | base64 -d > app/mealient-release-key.jks - - echo "storeFile=mealient-release-key.jks" > keystore.properties - - echo "storePassword=$MEALIE_KEY_STORE_PASSWORD" >> keystore.properties - - echo "keyAlias=$MEALIE_KEY_ALIAS" >> keystore.properties - - echo "keyPassword=$MEALIE_KEY_PASSWORD" >> keystore.properties - - ./gradlew assembleRelease - - cp app/build/outputs/apk/release/*.apk mealient-release.apk - artifacts: - paths: - - mealient-release.apk - rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' \ No newline at end of file From c2788dcd0f47977d16d22fcb332e588ac834b1a2 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Mon, 13 Jun 2022 20:11:35 +0200 Subject: [PATCH 3/3] Bump version to 0.2.4 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1eba495..05858e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { applicationId "gq.kirmanak.mealient" minSdk min_sdk_version targetSdk target_sdk_version - versionCode 12 - versionName "0.2.3" + versionCode 13 + versionName "0.2.4" javaCompileOptions { annotationProcessorOptions {