Merge pull request #2 from gmetal/master

Resolves missing application icons in newer Android versions
ChrisMpitzios · Oct 5, 2018 · b7587bd · b7587bd
2 parents 1bb5e60 + ca9bf58
commit b7587bd
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 599 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,11 +2,12 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
@@ -25,9 +27,9 @@ task clean(type: Delete) {
 
 
 ext {
-    buildToolsVersion = "25.0.0"
-    compileSdkVersion = 25
-    targetSdkVersion = 25
+    buildToolsVersion = "28.0.2"
+    compileSdkVersion = 27
+    targetSdkVersion = 27
     minSdkVersion = 14
     versionCode = 4
     versionName = "0.0.4"

diff --git a/config/quality.gradle b/config/quality.gradle
@@ -14,6 +14,9 @@ task checkstyle(type: Checkstyle) {
     exclude '**/gen/**'
 
     classpath = files()
+    checkstyle {
+        toolVersion = "6.5"
+    }
 }
 
 
@@ -22,7 +25,7 @@ task findbugs(type: FindBugs) {
     effort = "max"
     reportLevel = "high"
     excludeFilter = new File("${project.rootDir}/config/quality/findbugs/findbugs-filter.xml")
-    classes = files("${project.rootDir}/library/build/intermediates/classes")
+    classes = fileTree("${project.rootDir}/library/build/intermediates/javac/")
 
     source 'src'
     include '**/*.java'

diff --git a/config/quality/checkstyle/checkstyle.xml b/config/quality/checkstyle/checkstyle.xml
@@ -314,9 +314,7 @@
 
         <!-- Ensure a class has a package declaration. !-->
         <!-- See http://checkstyle.sf.net/config_coding.html !-->
-        <module name="PackageDeclaration">
-            <property name="ignoreDirectoryName" value="true" />
-        </module>
+        <module name="PackageDeclaration" />
 
     </module>
     <module name="TreeWalker">

diff --git a/glide-loader/.gitignore b/glide-loader/.gitignore
diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle
diff --git a/glide-loader/proguard-rules.pro b/glide-loader/proguard-rules.pro
diff --git a/glide-loader/src/main/AndroidManifest.xml b/glide-loader/src/main/AndroidManifest.xml
diff --git a/glide-loader/src/main/java/fr/tvbarthel/intentshare/loader/glide/GlideIconLoader.java b/glide-loader/src/main/java/fr/tvbarthel/intentshare/loader/glide/GlideIconLoader.java
diff --git 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-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -28,12 +28,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.9.5'
-    testCompile 'org.robolectric:robolectric:3.0'
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.android.support:recyclerview-v7:25.0.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'org.robolectric:robolectric:3.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
 }
 
 Properties properties = new Properties()