diff --git a/.gitignore b/.gitignore index 81cc9e9b..252008e0 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,9 @@ captures/ *.iml .idea +# Keystore files +*.jks + # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42e254a0..9a7ce1df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,17 +23,7 @@ before_script: build_develop: script: - ./gradlew assembleDebug - only: - - develop - artifacts: - name: "${CI_BUILD_NAME}" - paths: - - app/build/outputs/apk - -build_master: - script: - - ./gradlew assembleRelease - only: + except: - master artifacts: name: "${CI_BUILD_NAME}" diff --git a/README.md b/README.md index d1325283..69c60e28 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # mTHMMY -[![build status](https://gitlab.com/thmmy.gr/mTHMMY/badges/develop/build.svg)](https://gitlab.com/thmmy.gr/mTHMMY/commits/develop) +[![build status](https://gitlab.com/ThmmyNoLife/mTHMMY/badges/develop/build.svg)](https://gitlab.com/ThmmyNoLife/mTHMMY/commits/develop) [![API](https://img.shields.io/badge/API-19%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=19) [![Discord Channel](https://img.shields.io/badge/discord-public@mTHMMY-738bd7.svg?style=flat)](https://discord.gg/CVt3yrn) diff --git a/ThmmyNoLife.jks b/ThmmyNoLife.jks deleted file mode 100644 index d0a7c7f7..00000000 Binary files a/ThmmyNoLife.jks and /dev/null differ diff --git a/VERSION b/VERSION index 2eb3c4fe..eb49d7c7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5 +0.7 diff --git a/app/build.gradle b/app/build.gradle index d357db64..ab25c152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,25 +10,14 @@ android { minSdkVersion 19 targetSdkVersion 25 versionCode 5 - versionName "0.6" + versionName "0.7" archivesBaseName = "mTHMMY-v$versionName" } - signingConfigs { - release { - storeFile rootProject.file('ThmmyNoLife.jks') - storePassword System.getenv("KEYSTORE_PASS") - keyAlias System.getenv("KEY_NAME") - keyPassword System.getenv("KEY_PASS") - } - } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - if (System.getenv("CI")) - signingConfig signingConfigs.release } debug { def date = new Date().format('ddMMyy_HHmm');