Update

jahirfiquitiva · Dec 24, 2018 · 2eaab89 · sarsamurmu · Dec 28, 2018 · jahirfiquitiva
1 parent e20861d
commit 2eaab89
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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">
 
         <!-- TODO: Remove comment marks to enable Zooper
         <provider
@@ -275,14 +277,17 @@
         </activity>
 
         <!-- Muzei Service -->
-        <service
+        <provider
             android:name=".MuzeiService"
+            android:authorities="${applicationId}.muzei"
             android:label="@string/app_name"
             android:description="@string/app_description"
             android:icon="@drawable/ic_muzei_icon"
+            android:exported="true"
+            android:permission="com.google.android.apps.muzei.api.ACCESS_PROVIDER"
             tools:ignore="ExportedService">
             <intent-filter>
-                <action android:name="com.google.android.apps.muzei.api.MuzeiArtSource" />
+                <action android:name="com.google.android.apps.muzei.api.MuzeiArtProvider" />
             </intent-filter>
 
             <meta-data
@@ -291,11 +296,11 @@
             <meta-data
                 android:name="settingsActivity"
                 android:value="jahirfiquitiva.libs.frames.ui.activities.MuzeiSettingsActivity" />
-        </service>
+        </provider>
 
         <!-- Required for files access !!! DO NOT REMOVE !!! -->
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileProvider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git 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")
+class MuzeiService : FramesArtProvider()
diff --git 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
@@ -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
@@ -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
+org.gradle.daemon=true
+android.useAndroidX=true
+android.enableJetifier=true