From 4a159b25331c9b99ffb0d16f4bab0ec544b29572 Mon Sep 17 00:00:00 2001 From: AndroidDeveloperLB Date: Sun, 13 Aug 2017 23:51:04 +0300 Subject: [PATCH] fixed issues of using newer versions of gradle. --- .idea/gradle.xml | 8 +--- .idea/misc.xml | 15 +------ .idea/modules.xml | 2 +- app/app.iml | 34 ++++++++++----- app/build.gradle | 10 ++--- build.gradle | 6 +-- gradle/wrapper/gradle-wrapper.properties | 4 +- library/build.gradle | 8 ++-- library/library.iml | 42 +++++++++---------- .../foreground/widget/ForegroundViewImlp.java | 2 +- library/src/main/res/values/attrs.xml | 4 +- 11 files changed, 62 insertions(+), 73 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0091d57..66e2f6f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,13 +12,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981..635999d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index db3e038..b9025a1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/app/app.iml b/app/app.iml index d63f09c..dd1800b 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,7 +9,6 @@ - + @@ -32,12 +31,14 @@ + + @@ -45,7 +46,6 @@ - @@ -53,7 +53,6 @@ - @@ -61,7 +60,6 @@ - @@ -69,7 +67,6 @@ - @@ -77,23 +74,38 @@ - - - + + + + + + + + + + + + + + + + + - + - + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 9ba333a..bb30f4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion BUILD_TOOLS_VERSION + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { applicationId "com.anttek.foreground.sample" minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -24,6 +24,6 @@ repositories { } } dependencies { - compile 'com.anttek.foreground.widget:library:1.0.2@aar' -// compile project(':library') +// compile 'com.anttek.foreground.widget:library:1.1.0@aar' + compile project(':library') } diff --git a/build.gradle b/build.gradle index 53e15f9..5915c9f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' - classpath "com.github.dcendents:android-maven-gradle-plugin:1.3" + classpath 'com.android.tools.build:gradle:3.0.0-alpha9' + 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 73db393..02f8956 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jul 25 14:56:20 CEST 2016 +#Wed Aug 09 01:28:21 IDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip diff --git a/library/build.gradle b/library/build.gradle index a65aec8..fd3dae6 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -6,12 +6,12 @@ group = 'com.anttek.foreground.widget' version = VERSION android { - compileSdkVersion 23 - buildToolsVersion BUILD_TOOLS_VERSION + compileSdkVersion 26 + buildToolsVersion "26.0.0" defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -68,4 +68,4 @@ bintray { websiteUrl = 'https://github.com/baole/ForegroundView' } configurations = ['archives'] -} \ No newline at end of file +} diff --git a/library/library.iml b/library/library.iml index c3aa6a3..591d835 100644 --- a/library/library.iml +++ b/library/library.iml @@ -9,7 +9,6 @@ - + @@ -33,12 +32,14 @@ + + @@ -46,7 +47,6 @@ - @@ -54,7 +54,6 @@ - @@ -62,45 +61,42 @@ - - - - - - - - - - - - + + + + + + + + + - - + + - + + - - - + + \ No newline at end of file diff --git a/library/src/main/java/com/anttek/foreground/widget/ForegroundViewImlp.java b/library/src/main/java/com/anttek/foreground/widget/ForegroundViewImlp.java index 3f5bfd7..b67b41a 100644 --- a/library/src/main/java/com/anttek/foreground/widget/ForegroundViewImlp.java +++ b/library/src/main/java/com/anttek/foreground/widget/ForegroundViewImlp.java @@ -65,7 +65,7 @@ public void init(Context context, AttributeSet attrs, int defStyle) { } mForegroundInPadding = a.getBoolean( - R.styleable.ForegroundWidget_android_foregroundInsidePadding, true); + R.styleable.ForegroundWidget_foregroundInsidePadding, true); a.recycle(); } diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index 09caeae..e49cab9 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -2,7 +2,7 @@ - + - \ No newline at end of file +