Skip to content

Commit

Permalink
Update to v 1.4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jahirfiquitiva committed Sep 12, 2019
1 parent 90298f7 commit 4e3c7c9
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 17 deletions.
20 changes: 12 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
language: android
dist: trusty
sudo: false
jdk:
- oraclejdk8

env:
global:
- ANDROID_API=29
- ANDROID_BUILD_TOOLS=29.0.0
- ANDROID_BUILD_TOOLS=29.0.2

android:
components:
Expand All @@ -14,15 +18,16 @@ android:
- 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"

jdk:
- oraclejdk8

script: ./gradlew clean test --stacktrace
script: ./gradlew clean test --full-stacktrace

branches:
except:
Expand All @@ -34,14 +39,12 @@ branches:
notifications:
email: false
slack:
rooms: jahirfiquitiva:StCMaxV85iad38DdSMBY43xW
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>.'
sudo: false
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
Expand All @@ -56,3 +59,4 @@ cache:
before_script:
- chmod +x gradlew
- chmod +x gradle/wrapper/gradle-wrapper.jar
15 changes: 11 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ buildscript {
maven { url 'https://plugins.gradle.org/m2/' }
}
dependencies {
classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.12.2'
classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.12.5'
}
}
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
*/

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion versions.targetSdk
Expand Down Expand Up @@ -55,8 +57,8 @@ android {
applicationId "jahirfiquitiva.apps.blueprint.demo"
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
versionCode 146
versionName "1.4.6"
versionCode 149
versionName "1.4.9"
vectorDrawables.useSupportLibrary = true
proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
Expand All @@ -71,6 +73,7 @@ android {
shrinkResources false
proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
multiDexKeepProguard file('proguard-rules.pro')
}
}

Expand All @@ -93,11 +96,15 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {
// Blueprint
implementation('com.jahirfiquitiva:Blueprint:1.4.6@aar') {
implementation('com.jahirfiquitiva:Blueprint:1.4.9@aar') {
transitive = true
}
// TODO: Remove comment marks to enable
Expand Down
8 changes: 4 additions & 4 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ ext.versions = [
// Projects
minSdk : 16,
targetSdk : 29,
buildTools: '29.0.0',
buildTools: '29.0.2',
// Gradle Plugins
gradle : '3.4.2',
kotlin : '1.3.21',
gradle : '3.5.0',
kotlin : '1.3.50',
// Dependencies
oneSignal : '3.11.1'
oneSignal : '3.11.3'
]

ext.gradlePlugins = [
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 comments on commit 4e3c7c9

Please sign in to comment.