diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle index 164f11425a..c7bacd5e4d 100644 --- a/MPChartExample/build.gradle +++ b/MPChartExample/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'realm-android' android { compileSdkVersion 27 - buildToolsVersion '26.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 16 targetSdkVersion 27 @@ -39,7 +39,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' //classpath 'io.realm:realm-gradle-plugin:0.88.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivityColored.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivityColored.java index 68bba4b458..369e6448ed 100644 --- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivityColored.java +++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivityColored.java @@ -4,6 +4,7 @@ import android.graphics.Color; import android.graphics.Typeface; import android.os.Bundle; +import android.util.Log; import android.view.WindowManager; import com.github.mikephil.charting.charts.LineChart; diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java index 30e5e2a978..dfc32bbcbe 100644 --- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java +++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java @@ -84,10 +84,10 @@ protected void onCreate(Bundle savedInstanceState) { xAxis.setPosition(XAxis.XAxisPosition.TOP_INSIDE); xAxis.setTypeface(mTfLight); xAxis.setTextSize(10f); - xAxis.setTextColor(Color.WHITE); + xAxis.setTextColor(Color.BLUE); xAxis.setDrawAxisLine(false); xAxis.setDrawGridLines(true); - xAxis.setTextColor(Color.rgb(255, 192, 56)); +// xAxis.setTextColor(Color.rgb(255, 192, 56)); xAxis.setCenterAxisLabels(true); xAxis.setGranularity(1f); // one hour xAxis.setValueFormatter(new IAxisValueFormatter() { diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java index 59b73b1ad7..f84274eaab 100644 --- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java +++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java @@ -6,6 +6,7 @@ import android.renderscript.Type; import android.support.annotation.Nullable; import android.support.v4.app.FragmentActivity; +import android.util.Log; import com.xxmassdeveloper.mpchartexample.R; @@ -36,6 +37,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mTfRegular = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf"); mTfLight = Typeface.createFromAsset(getAssets(), "OpenSans-Light.ttf"); + + Log.d("OpenActivity", this.getClass().getName()); } protected float getRandom(float range, float startsfrom) { diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle index 8e19df7541..8575e37e2f 100644 --- a/MPChartLib/build.gradle +++ b/MPChartLib/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'maven' android { compileSdkVersion 27 - buildToolsVersion '26.0.2' + buildToolsVersion '27.0.3' // resourcePrefix 'mpcht' defaultConfig { minSdkVersion 9 @@ -34,11 +34,9 @@ repositories { } dependencies { - //compile fileTree(dir: 'libs', include: ['*.jar']) - //compile 'com.android.support:support-v4:19.+' //provided 'io.realm:realm-android:0.87.5' // "optional" dependency to realm-database API - testCompile 'junit:junit:4.12' - testCompile "org.mockito:mockito-core:1.10.19" + testImplementation 'junit:junit:4.12' + testImplementation "org.mockito:mockito-core:1.10.19" } android.libraryVariants.all { variant -> diff --git a/build.gradle b/build.gradle index 92f3d64ccd..65ca5186cf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,3 @@ -//task wrapper(type: Wrapper) { -// gradleVersion = '2.9' -//} - buildscript { repositories { jcenter() @@ -9,7 +5,7 @@ buildscript { } dependencies { classpath "io.realm:realm-gradle-plugin:4.2.0" - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' } } @@ -17,9 +13,6 @@ buildscript { allprojects { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 845ff30cac..02b0428be0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 20 11:59:54 CET 2017 +#Wed Apr 25 08:04:33 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip