Merge pull request #37 from sentiohq/upgrade

upgrade build tool and lib
JackyAndroid · Jun 14, 2017 · 645fea5 · 645fea5
2 parents 26a0711 + dd71f3d
commit 645fea5
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 32 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,13 +6,13 @@ android {
 
         }
     }
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
     enforceUniquePackageName false
     defaultConfig {
         applicationId "org.chromium.chrome.browser"
         minSdkVersion 19
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -32,9 +32,6 @@ android {
         noCompress "dat", "bin", "pak"
     }
 
-    productFlavors {
-        wandoujia {}
-    }
 
     lintOptions {
         abortOnError false

diff --git a/app/src/main/java/org/chromium/chrome/browser/widget/TintedImageButton.java b/app/src/main/java/org/chromium/chrome/browser/widget/TintedImageButton.java
@@ -37,7 +37,7 @@ public TintedImageButton(Context context, AttributeSet attrs, int defStyle) {
     private void init(Context context, AttributeSet attrs, int defStyle) {
         TypedArray a = context.obtainStyledAttributes(
                 attrs, R.styleable.TintedImage, defStyle, 0);
-        setTintInternal(a.getColorStateList(R.styleable.TintedImage_tint));
+        setTintInternal(a.getColorStateList(R.styleable.TintedImage_tintImage));
         a.recycle();
     }
 

diff --git a/app/src/main/java/org/chromium/chrome/browser/widget/TintedImageView.java b/app/src/main/java/org/chromium/chrome/browser/widget/TintedImageView.java
@@ -37,7 +37,7 @@ public TintedImageView(Context context, AttributeSet attrs, int defStyle) {
     private void init(Context context, AttributeSet attrs, int defStyle) {
         TypedArray a = context.obtainStyledAttributes(
                 attrs, R.styleable.TintedImage, defStyle, 0);
-        setTintInternal(a.getColorStateList(R.styleable.TintedImage_tint));
+        setTintInternal(a.getColorStateList(R.styleable.TintedImage_tintImage));
         a.recycle();
     }
 

diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        maven { url 'https://maven.google.com' }
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'https://maven.google.com' }
         jcenter()
     }
 }

diff --git a/libraries_res/androidmedia_res/build.gradle b/libraries_res/androidmedia_res/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }

diff --git a/libraries_res/chrome_res/build.gradle b/libraries_res/chrome_res/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     enforceUniquePackageName false
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -23,13 +23,13 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:support-annotations:23.1.0'
-    compile 'com.android.support:recyclerview-v7:24.1.0'
-    compile 'com.android.support:support-v13:24.1.0'
-    compile 'com.android.support:multidex:1.0.0'
-    compile 'com.android.support:appcompat-v7:24.0.1'
-    compile 'com.android.support:mediarouter-v7:24.1.1'
-    compile 'com.android.support:design:24.1.0'
+    compile 'com.android.support:support-annotations:25.4.0'
+    compile 'com.android.support:recyclerview-v7:25.4.0'
+    compile 'com.android.support:support-v13:25.4.0'
+    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:appcompat-v7:25.4.0'
+    compile 'com.android.support:mediarouter-v7:25.4.0'
+    compile 'com.android.support:design:25.4.0'
     compile 'com.google.android.gms:play-services-cast:10.2.0'
     compile 'com.google.android.gms:play-services-gcm:10.2.0'
     compile 'com.google.android.gms:play-services-nearby:10.2.0'

diff --git a/libraries_res/chrome_res/src/main/res/values/attrs.xml b/libraries_res/chrome_res/src/main/res/values/attrs.xml
@@ -5,7 +5,7 @@
 
 <resources>
     <declare-styleable name="TintedImage">
-        <attr name="tint" format="reference|color" />
+        <attr name="tintImage" format="reference|color" />
     </declare-styleable>
 
     <declare-styleable name="HyperlinkPreference">

diff --git a/libraries_res/content_res/build.gradle b/libraries_res/content_res/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     enforceUniquePackageName false
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }

diff --git a/libraries_res/datausagechart_res/build.gradle b/libraries_res/datausagechart_res/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }

diff --git a/libraries_res/ui_res/build.gradle b/libraries_res/ui_res/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     enforceUniquePackageName false
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }