diff --git a/app/build.gradle b/app/build.gradle
index 97e8f4142..be01b338e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ buildscript {
maven { url 'https://plugins.gradle.org/m2/' }
}
dependencies {
- classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.11.2'
+ classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.12.1'
}
}
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
@@ -55,8 +55,8 @@ android {
applicationId "jahirfiquitiva.apps.blueprint.demo"
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
- versionCode 131
- versionName "1.3.1"
+ versionCode 140
+ versionName "1.4.0"
vectorDrawables.useSupportLibrary = true
proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
@@ -91,7 +91,7 @@ android {
dependencies {
// Blueprint
- implementation('com.jahirfiquitiva:Blueprint:1.3.1@aar') {
+ implementation('com.jahirfiquitiva:Blueprint:1.4.0@aar') {
transitive = true
}
// TODO: Remove comment marks to enable
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8c08fde5e..13eaa6227 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -37,6 +37,9 @@
**[] $VALUES;
public *;
}
+-keep public class com.bumptech.glide.integration.webp.WebpImage { *; }
+-keep public class com.bumptech.glide.integration.webp.WebpFrame { *; }
+-keep public class com.bumptech.glide.integration.webp.WebpBitmapFactory { *; }
-keep class android.support.design.widget.NavigationView { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 756e165f5..c6d101508 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,7 +30,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/MySplashScreen"
- android:manageSpaceActivity="jahirfiquitiva.libs.blueprint.ui.activities.SettingsActivity">
+ android:manageSpaceActivity="jahirfiquitiva.libs.blueprint.ui.activities.SettingsActivity"
+ android:networkSecurityConfig="@xml/network_security_config"
+ tools:ignore="UnusedAttribute">
-
-
+
-
+
diff --git a/app/src/main/kotlin/jahirfiquitiva/apps/blueprint/demo/MuzeiService.kt b/app/src/main/kotlin/jahirfiquitiva/apps/blueprint/demo/MuzeiService.kt
index 3f15defbf..b2f87f73d 100644
--- a/app/src/main/kotlin/jahirfiquitiva/apps/blueprint/demo/MuzeiService.kt
+++ b/app/src/main/kotlin/jahirfiquitiva/apps/blueprint/demo/MuzeiService.kt
@@ -15,7 +15,6 @@
*/
package jahirfiquitiva.apps.blueprint.demo
-import jahirfiquitiva.libs.frames.data.services.FramesArtSource
+import jahirfiquitiva.libs.frames.data.services.FramesArtProvider
-// TODO: Use a unique name instead of MyBlueprintMuzeiService
-class MuzeiService : FramesArtSource("MyBlueprintMuzeiService")
\ No newline at end of file
+class MuzeiService : FramesArtProvider()
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e2c8ef6f7..7d561e6c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,7 @@ buildscript {
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
+ maven { url "https://dl.bintray.com/drummer-aidan/maven/" }
}
dependencies {
@@ -41,6 +42,7 @@ allprojects {
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
+ maven { url "https://dl.bintray.com/drummer-aidan/maven/" }
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index e3560a1f3..08652e290 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -19,10 +19,10 @@ ext.versions = [
targetSdk : 28,
buildTools: '28.0.3',
// Gradle Plugins
- gradle : '3.2.0',
- kotlin : '1.2.71',
+ gradle : '3.2.1',
+ kotlin : '1.3.11',
// Dependencies
- oneSignal : '3.10.1'
+ oneSignal : '3.10.5'
]
ext.gradlePlugins = [
diff --git a/gradle.properties b/gradle.properties
index cca477566..98b662a46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,6 @@ 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
\ No newline at end of file
+org.gradle.daemon=true
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file