diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..a12e2deb0 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,42 @@ +name: Build + +on: + push: + branches: + - sample + - master + +jobs: + test: + name: Build app + runs-on: ubuntu-18.04 + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + + - name: Delete some caches + run: rm -f ~/.gradle/caches/modules-2/modules-2.lock; rm -fr ~/.gradle/caches/*/plugin-resolution/ + + - name: Cache Gradle + uses: actions/cache@v2 + with: + path: | + ~/.android/build-cache + ~/.m2 + ~/.gradle + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Make gradlew executable + run: chmod +x gradlew; chmod +x gradle/wrapper/gradle-wrapper.jar + + - name: Build + run: ./gradlew clean test --full-stacktrace diff --git a/.gitignore b/.gitignore index b915109ce..db0349be8 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,5 @@ proguard/ /report app/release +.project +.classpath diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 52700237d..000000000 --- a/.travis.yml +++ /dev/null @@ -1,61 +0,0 @@ -language: android -dist: trusty -sudo: false -jdk: oraclejdk8 - -env: - global: - - ANDROID_API=30 - - ANDROID_BUILD_TOOLS=30.0.2 - -android: - components: - - tools - - platform-tools - - build-tools-$ANDROID_BUILD_TOOLS - - android-$ANDROID_API - - extra-android-support - - extra-google-m2repository - - extra-android-m2repository - licenses: - - '.+' - -before_install: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - - yes | sdkmanager "platforms;android-$ANDROID_API" - - yes | sdkmanager "build-tools;$ANDROID_BUILD_TOOLS" - -script: ./gradlew clean test --full-stacktrace - -branches: - except: - - images - - gh-pages - - travis-build - - i18n - -notifications: - email: false - slack: - rooms: jahirfiquitiva:BPPLJNqX4mxGp8h2lkkotgNn - template: - - 'Build <%{build_url}|#%{build_number}> (<%{compare_url}|%{commit}: ''%{commit_subject}''>) by - %{author} for %{repository_name}@%{branch}, %{result} in %{duration}. <%{build_url}|Check - details>.' - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - -cache: - directories: - - "$HOME/.android/build-cache" - - "$HOME/.m2" - - "$HOME/.gradle" - - "$HOME/.gradle/caches/" - - "$HOME/.gradle/wrapper/" - -before_script: - - chmod +x gradlew - - chmod +x gradle/wrapper/gradle-wrapper.jar diff --git a/README.md b/README.md index 113ac6b06..c2258ab81 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,8 @@ Blueprint ![API](https://img.shields.io/badge/API-21%2B-34bf49.svg) [![GitHub Release](https://img.shields.io/github/v/release/jahirfiquitiva/Blueprint?label=Blueprint&sort=semver)](https://github.com/jahirfiquitiva/Blueprint/releases/latest) -[![Build Status](https://travis-ci.com/jahirfiquitiva/Blueprint.svg?branch=master)](https://travis-ci.com/jahirfiquitiva/Blueprint) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/55f3f196492a4ea88f13da0f219b9125)](https://www.codacy.com/app/jahirfiquitiva/Blueprint?utm_source=github.com&utm_medium=referral&utm_content=jahirfiquitiva/Blueprint&utm_campaign=Badge_Grade) -[![Crowdin](https://badges.crowdin.net/blueprint/localized.svg)](https://crowdin.com/project/blueprint) +[![Build Status](https://github.com/jahirfiquitiva/Blueprint/actions/workflows/build.yml/badge.svg?branch=sample)](https://github.com/jahirfiquitiva/Blueprint/actions/workflows/build.yml) +[![Crowdin](https://badges.crowdin.net/blueprint/localized.svg)](https://crowdin.com/project/blueprint/invite) Free, feature-rich, easily customizable Android dashboard for icon packs diff --git a/buildSrc/src/main/java/MyApp.kt b/buildSrc/src/main/java/MyApp.kt index def5d3d73..9db402ae4 100644 --- a/buildSrc/src/main/java/MyApp.kt +++ b/buildSrc/src/main/java/MyApp.kt @@ -2,6 +2,6 @@ object MyApp { const val appId = "dev.jahir.blueprint.app" - const val version = 223 - const val versionName = "2.2.3" + const val version = 224 + const val versionName = "2.2.4" } diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index c8b058cdc..357ea9873 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -2,12 +2,12 @@ object Versions { // Plugins - const val gradle = "4.2.1" - const val kotlin = "1.5.0" + const val gradle = "7.0.0" + const val kotlin = "1.5.21" // OneSignal - const val oneSignalPlugin = "0.12.10" - const val oneSignal = "4.3.4" + const val oneSignalPlugin = "0.13.4" + const val oneSignal = "4.4.2" // App const val minSdk = 21 @@ -15,5 +15,5 @@ object Versions { const val buildTools = "30.0.2" // Blueprint - const val blueprint = "2.2.3" + const val blueprint = "2.2.4" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5c02d6ca8..4ad12cf76 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip