Skip to content

Commit

Permalink
Update to v 2.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jahirfiquitiva committed Sep 12, 2019
1 parent 441a439 commit 878fb2f
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 19 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
13 changes: 9 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +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 @@ -56,8 +57,8 @@ android {
applicationId "jahirfiquitiva.apps.frames.sample"
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
versionCode 272
versionName '2.7.2'
versionCode 273
versionName '2.7.3'
vectorDrawables.useSupportLibrary = true
proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
Expand Down Expand Up @@ -89,11 +90,15 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {
// Frames
implementation('com.jahirfiquitiva:Frames:2.7.2@aar') {
implementation('com.jahirfiquitiva:Frames:2.7.3@aar') {
transitive = true
}
// TODO: Remove comment marks to enable
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<!-- TODO: Change this link -->
<!-- This is the link for the JSON file where you have listed your wallpapers -->
<string name="json_url">https://jahirfiquitiva.com/frames/wallpapers.json</string>
<string name="json_url">https://jahir.dev/frames/wallpapers.json</string>

<!-- Default wallpapers download folder. Always write it like '%1$s/xxxxxxx' -->
<string name="default_download_folder">%1$s/Frames/Wallpapers</string>
Expand Down
8 changes: 4 additions & 4 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ 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',
oneSignal : '3.11.1'
gradle : '3.5.0',
kotlin : '1.3.50',
oneSignal : '3.11.3'
]

ext.gradlePlugins = [
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
org.gradle.parallel=true
org.gradle.daemon=true
# Define proguard files location
proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt
android.useAndroidX=true
android.enableJetifier=true
kapt.incremental.apt=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,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 878fb2f

Please sign in to comment.