diff --git a/GraphView.iml b/GraphView.iml index d9c648497..de69050e6 100644 --- a/GraphView.iml +++ b/GraphView.iml @@ -60,14 +60,10 @@ - - - - diff --git a/build.gradle b/build.gradle index 56d4889c6..5163dc928 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { minSdkVersion 7 targetSdkVersion 20 - versionCode 1 + versionCode 2 versionName "1.0" } buildTypes { @@ -19,8 +19,6 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:20.+' - compile 'com.android.support:support-v4:20.+' } // This is the actual solution, as in http://stackoverflow.com/a/19037807/1002054 @@ -29,7 +27,7 @@ task clearJar(type: Delete) { } task makeJar(type: Copy) { - from('build/bundles/release/') + from('build/intermediates/bundles/release/') into('build/libs/') include('classes.jar') rename ('classes.jar', 'myCompiledLibrary.jar') diff --git a/public/GraphView-3.1.3.jar b/public/GraphView-3.1.3.jar new file mode 100644 index 000000000..94289eeed Binary files /dev/null and b/public/GraphView-3.1.3.jar differ diff --git a/src/main/java/com/jjoe64/graphview/GraphView.java b/src/main/java/com/jjoe64/graphview/GraphView.java index 718bf4d2a..448927318 100755 --- a/src/main/java/com/jjoe64/graphview/GraphView.java +++ b/src/main/java/com/jjoe64/graphview/GraphView.java @@ -99,7 +99,7 @@ protected void onDraw(Canvas canvas) { paint.getTextBounds(testLabel, 0, testLabel.length(), textBounds); // multiline int lines = 1; - for (byte c : testLabel.getBytes(Charset.defaultCharset())) { + for (byte c : testLabel.getBytes()) { if (c == '\n') lines++; } labelTextHeight = textBounds.height()*lines;