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 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 { 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