Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolves missing application icons in newer Android versions #2

Merged
merged 3 commits into from
Oct 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -15,6 +16,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
}
}
Expand All @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion config/quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ task checkstyle(type: Checkstyle) {
exclude '**/gen/**'

classpath = files()
checkstyle {
toolVersion = "6.5"
}
}


Expand All @@ -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'
Expand Down
4 changes: 1 addition & 3 deletions config/quality/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 0 additions & 1 deletion glide-loader/.gitignore

This file was deleted.

125 changes: 0 additions & 125 deletions glide-loader/build.gradle

This file was deleted.

17 changes: 0 additions & 17 deletions glide-loader/proguard-rules.pro

This file was deleted.

5 changes: 0 additions & 5 deletions glide-loader/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading