Skip to content
This repository has been archived by the owner on Dec 1, 2017. It is now read-only.

fixed the project for android studio 3.0 #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:2.3.0'
}
}

Expand All @@ -13,23 +13,24 @@ allprojects {
}
}

apply plugin: 'android'
apply plugin: 'com.android.application'

android {
compileSdkVersion 19
buildToolsVersion "21.1.2"
compileSdkVersion 25
buildToolsVersion "25.0.3"

defaultConfig {
minSdkVersion 14
targetSdkVersion 19
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:21.0.+'
compile 'com.squareup.picasso:picasso:2.2.0'
//noinspection GradleCompatible
compile 'com.android.support:support-v4:25.3.1'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'org.lucasr.smoothie:smoothie:0.1.0'
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Jan 31 22:57:10 GMT 2015
#Sat Jun 03 01:31:19 NPT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.util.AttributeSet;
import android.util.FloatMath;
import android.util.Log;
import android.util.TypedValue;
import android.view.View.MeasureSpec;
Expand Down Expand Up @@ -141,8 +140,7 @@ private int getDesiredWidth() {
for (int i = 0; i < lineCount; i++) {
maxWidth = Math.max(maxWidth, mLayout.getLineWidth(i));
}

return (int) FloatMath.ceil(maxWidth);
return (int) Math.ceil(maxWidth);
}

private int getDesiredHeight() {
Expand Down Expand Up @@ -367,7 +365,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

if (boring == null || boring == UNKNOWN_BORING) {
if (desiredWidth < 0) {
desiredWidth = (int) FloatMath.ceil(Layout.getDesiredWidth(mText, mPaint));
desiredWidth = (int) Math.ceil(Layout.getDesiredWidth(mText, mPaint));
}

width = desiredWidth;
Expand Down