diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 35a84a76..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,96 +0,0 @@ -# Java Gradle CircleCI 2.0 configuration file -# -# Check https://circleci.com/docs/2.0/language-java/ for more details -# -version: 2 - -general: - branches: - only: - #- circleci -jobs: - build: - docker: - # specify the version you desire here - #- image: circleci/openjdk:8-jdk - - # CircleCI maintains a library of pre-built images - # documented at https://circleci.com/docs/2.0/circleci-images/ - - image: circleci/android:api-30 - - working_directory: ~/repo - - environment: - # Customize the JVM maximum heap limit - JVM_OPTS: -Xmx3200m - TERM: dumb -# KEYSTORE: ${CIRCLE_WORKING_DIRECTORY}/sigining.keystore -# PUBLISHER_ACCT_JSON_FILE: ${CIRCLE_WORKING_DIRECTORY}/publisher_profile.json - - steps: - - checkout - - - run: echo 'export KEYSTORE=${HOME}/repo/sigining.keystore' >> $BASH_ENV - - run: echo 'export PUBLISHER_ACCT_JSON_FILE=${HOME}/repo/publisher_profile.json' >> $BASH_ENV - - # Download and cache dependencies - - restore_cache: - keys: - - v1-dependencies-{{ checksum "build.gradle" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- - - # Get private keys etc - - run: ./misc/download_keystore.sh - - run: ./misc/inject_circle_build_number.sh - - - run: ./gradlew dependencies - - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "build.gradle" }} - - # run tests & code coc! - - run: ./gradlew testDebugUnitTest jacocoTestDebugUnitTestReport - - # build release - - run: ./gradlew assembleRelease - - # javadoc - - run: ./gradlew javadoc - - # trigger codecod.io - - run: bash <(curl -s https://codecov.io/bash) - - - store_artifacts: - path: androidplot-core/build/outputs/aar/ - destination: aar - - - store_artifacts: - path: demoapp/build/outputs/apk/ - destination: apk - - - store_artifacts: - path: androidplot-core/build/reports/jacoco/debug/ - destination: coverage_report - - - store_artifacts: - path: androidplot-core/build/reports/tests/ - destination: test_results - - - store_artifacts: - path: androidplot-core/build/docs/javadoc - destination: javadoc - - - store_test_results: - path: androidplot-core/build/test-results/ - - - deploy: - name: "Publish" - command: | - if [ "${CIRCLE_BRANCH}" == "master" ]; - then - ./misc/download_google_publisher_json.sh; - ./gradlew publish; - fi \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..d38f337e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,57 @@ +name: build androidplot +on: [push] +jobs: + build-and-test: + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v3 + + - name: Set Up JDK 17 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '17' + + - name: Build and Test + run: ./gradlew testDebugUnitTest jacocoTestDebugUnitTestReport + + - name: Build Release + env: + ENCODED: ${{ secrets.DEMOAPP_KEYSTORE }} + KEYSTORE: keystore.jks + KEY_ALIAS: Key0 + KEYSTORE_PASSWORD: ${{ secrets.DEMOAPP_KEYSTORE_PASSWORD }} + KEY_PASSWORD: ${{ secrets.DEMOAPP_KEY_PASSWORD }} + run: | + echo $ENCODED | base64 -di > "${GITHUB_WORKSPACE}/demoapp/keystore.jks" + ./gradlew assembleRelease + +# TODO: get javadoc working again at some point +# - name: Javadoc +# run: ./gradlew javadoc + + - name: Code Coverage + run: bash <(curl -s https://codecov.io/bash) + + - uses: actions/upload-artifact@v3 + with: + name: Core Library + path: androidplot-core/build/outputs/aar/*.aar + retention-days: 30 + + - uses: actions/upload-artifact@v3 + if: github.ref_name == 'master' + with: + name: Demoapp APK + path: demoapp/build/outputs/apk/release/*.apk + retention-days: 30 + + - name: Stage for Maven Central + if: github.ref_name == 'master' + env: + OSSRH_ACTOR: ${{ secrets.OSSRH_ACTOR }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }} + run: ./gradlew publish \ No newline at end of file diff --git a/README.md b/README.md index 42b3f9ea..9617a26e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -# ![image](docs/images/aplogo_small.png) Androidplot [![CircleCI](https://circleci.com/gh/halfhp/androidplot.svg?style=shield)](https://circleci.com/gh/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot) +# ![image](docs/images/aplogo_small.png) Androidplot [![AndroidPlot](https://www.appbrain.com/stats/libraries/shield/androidplot.svg)](https://www.appbrain.com/stats/libraries/details/androidplot/androidplot) [![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot) -A library for creating dynamic and static charts in Android apps. It’s designed from the ground up for Android, -compatible with all versions of Android from 1.6 onward and is **used by over -[1,000 apps](http://www.appbrain.com/stats/libraries/details/androidplot/androidplot) on Google Play**. +A library for creating dynamic and static charts in Android apps. -[![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) +Androidplot is compatible with all versions of Android from 1.6 onward, works equally with Kotlin and Java codebases +and is compatible with Jetpack compose. If you enjoy the lib, please [rate us on codix.io](http://codix.io/gh/repo/halfhp/androidplot)! diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index e81e40a2..b37b2b4a 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -16,7 +16,7 @@ plugins { id 'com.android.library' - id 'com.dicedmelon.gradle.jacoco-android' + id 'com.mxalbert.gradle.jacoco-android' id 'maven-publish' id 'signing' } @@ -31,13 +31,14 @@ class AttrMarkdown extends DefaultTask { def input = project.file(inFile) def output = project.file(outFile) - if(output.exists()) { + if (output.exists()) { output.delete() } output.parentFile.mkdirs() - input.text.findAll(//) { match, g1 -> g1 - if(!g1.startsWith("NODOC")) { + input.text.findAll(//) { match, g1 -> + g1 + if (!g1.startsWith("NODOC")) { output.append(g1) output.append "\n\n" } @@ -53,14 +54,20 @@ class AttrMarkdown extends DefaultTask { * The generated doc will appear in / replace androidplot/docs/attrs.md */ task generateAttrsMarkdown(type: AttrMarkdown) { - inFile = { "src/main/res/values/attrs.xml"} + inFile = { "src/main/res/values/attrs.xml" } outFile = { "../docs/attrs.md" } } android { - compileSdkVersion theCompileSdkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + defaultConfig { + compileSdk theCompileSdkVersion minSdkVersion theMinSdkVersion targetSdkVersion theTargetSdkVersion testApplicationId "com.androidplot.test" @@ -74,11 +81,17 @@ android { } } } - - lintOptions { - // TODO: enable and address lint issues. + lint { abortOnError false } + namespace 'com.androidplot' + + publishing { + singleVariant("release") { + withSourcesJar() + withJavadocJar() + } + } } group = 'com.androidplot' @@ -90,44 +103,38 @@ def gitUrl = 'https://github.com/halfhp/androidplot.git' dependencies { implementation 'com.halfhp.fig:figlib:1.0.11' - implementation 'com.android.support:support-annotations:28.0.0' + implementation 'androidx.annotation:annotation:1.8.2' - testImplementation "org.mockito:mockito-core:3.9.0" + testImplementation "org.mockito:mockito-core:5.7.0" testImplementation group: 'junit', name: 'junit', version: '4.13.2' - testImplementation "org.robolectric:robolectric:4.5.1" -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - failOnError false - options { - links "http://docs.oracle.com/javase/7/docs/api/" - linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference" - } - exclude '**/BuildConfig.java' - exclude '**/R.java' + testImplementation "org.robolectric:robolectric:4.7.3" } -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -task sourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.srcDirs -} - -javadoc { - options.overview = "src/main/java/overview.html" -} +// TODO: get javadoc working again at some point +//task javadoc(type: Javadoc) { +// source = android.sourceSets.main.java.srcDirs +// classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +// failOnError false +// options { +// links "http://docs.oracle.com/javase/7/docs/api/" +// linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference" +// } +// exclude '**/BuildConfig.java' +// exclude '**/R.java' +//} +// + + +// TODO: get javadoc working again at some point +//javadoc { +// options.overview = "src/main/java/overview.html" +//} afterEvaluate { publishing { repositories { maven { - name = "Maven Central" + name = "MavenCentral" url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" credentials { username = System.getenv("OSSRH_ACTOR") @@ -138,7 +145,6 @@ afterEvaluate { publications { release(MavenPublication) { - from components.release // You can then customize attributes of the publication as shown below. @@ -168,7 +174,6 @@ afterEvaluate { connection = gitUrl developerConnection = gitUrl url = gitUrl - } } } @@ -176,16 +181,9 @@ afterEvaluate { } } -afterEvaluate { - signing { - def signingKey = System.getenv("SIGNING_KEY") - def signingPassword = System.getenv("SIGNING_PASSWORD") - useInMemoryPgpKeys(signingKey, signingPassword) - sign publishing.publications.release - } -} - -artifacts { - archives javadocJar - archives sourcesJar +signing { + def signingKey = System.getenv("SIGNING_KEY") + def signingPassword = System.getenv("SIGNING_PASSWORD") + useInMemoryPgpKeys(signingKey, signingPassword) + sign(publishing.publications) } diff --git a/androidplot-core/src/main/AndroidManifest.xml b/androidplot-core/src/main/AndroidManifest.xml index e83183d1..3043c930 100644 --- a/androidplot-core/src/main/AndroidManifest.xml +++ b/androidplot-core/src/main/AndroidManifest.xml @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java index 4f6fa04a..8fa0571f 100644 --- a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java +++ b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java @@ -564,7 +564,7 @@ protected void doOnDraw(Canvas canvas, RectF widgetRect) { } protected void drawDomainLine(Canvas canvas, float xPix, Number xVal, - Paint linePaint, boolean isOrigin) { + Paint linePaint, boolean isOrigin, boolean shouldDrawLabel) { // lines if (linePaint != null) { @@ -574,12 +574,19 @@ protected void drawDomainLine(Canvas canvas, float xPix, Number xVal, } // labels - drawLineLabel(canvas, Edge.TOP, xVal, xPix, labelRect.top, isOrigin); - drawLineLabel(canvas, Edge.BOTTOM, xVal, xPix, labelRect.bottom, isOrigin); + if(shouldDrawLabel) { + if (isLineLabelEnabled(Edge.TOP)) { + drawLineLabel(canvas, Edge.TOP, xVal, xPix, labelRect.top, isOrigin); + } + + if (isLineLabelEnabled(Edge.BOTTOM)) { + drawLineLabel(canvas, Edge.BOTTOM, xVal, xPix, labelRect.bottom, isOrigin); + } + } } protected void drawRangeLine(Canvas canvas, float yPix, Number yVal, - Paint linePaint, boolean isOrigin) { + Paint linePaint, boolean isOrigin, boolean shouldDrawLabel) { // lines if (linePaint != null) { canvas.drawLine(gridRect.left - lineExtensionLeft, yPix, @@ -587,9 +594,15 @@ protected void drawRangeLine(Canvas canvas, float yPix, Number yVal, ); } - // labels - drawLineLabel(canvas, Edge.LEFT, yVal, labelRect.left, yPix, isOrigin); - drawLineLabel(canvas, Edge.RIGHT, yVal, labelRect.right, yPix, isOrigin); + if(shouldDrawLabel) { + // labels + if (isLineLabelEnabled(Edge.LEFT)) { + drawLineLabel(canvas, Edge.LEFT, yVal, labelRect.left, yPix, isOrigin); + } + if (isLineLabelEnabled(Edge.RIGHT)) { + drawLineLabel(canvas, Edge.RIGHT, yVal, labelRect.right, yPix, isOrigin); + } + } } protected void drawLineLabel(Canvas canvas, @@ -598,9 +611,7 @@ protected void drawLineLabel(Canvas canvas, float x, float y, boolean isOrigin) { - if (isLineLabelEnabled(edge)) { - getLineLabelRenderer(edge).drawLabel(canvas, getLineLabelStyle(edge), val, x, y, isOrigin); - } + getLineLabelRenderer(edge).drawLabel(canvas, getLineLabelStyle(edge), val, x, y, isOrigin); } /** @@ -646,7 +657,7 @@ protected void drawGrid(Canvas canvas) { } else { linePaint = domainSubGridLinePaint; } - drawDomainLine(canvas, (float) xPix, xVal, linePaint, isOrigin); + drawDomainLine(canvas, (float) xPix, xVal, linePaint, isOrigin, isMajorTick); } Number rangeOrigin = plot.getRangeOrigin(); @@ -684,7 +695,7 @@ protected void drawGrid(Canvas canvas) { } else { linePaint = rangeSubGridLinePaint; } - drawRangeLine(canvas, (float) yPix, yVal, linePaint, isOrigin); + drawRangeLine(canvas, (float) yPix, yVal, linePaint, isOrigin, isMajorTick); } } diff --git a/androidplot-core/src/test/java/com/androidplot/PlotTest.java b/androidplot-core/src/test/java/com/androidplot/PlotTest.java index 5a750afd..9e4753bf 100644 --- a/androidplot-core/src/test/java/com/androidplot/PlotTest.java +++ b/androidplot-core/src/test/java/com/androidplot/PlotTest.java @@ -34,6 +34,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -44,7 +45,8 @@ public class PlotTest extends AndroidplotTest { @Test public void testInit_withoutAttrs() { - Plot plot = mock(Plot.class); + //Plot plot = mock(Plot.class); + Plot plot = spy(new MockPlot("MockPlot")); plot.init(RuntimeEnvironment.application, null, 0); verify(plot, times(1)).onPreInit(); @@ -53,10 +55,12 @@ public void testInit_withoutAttrs() { @Test public void testInit_withAttrs() { - Plot plot = new MockPlot("MockPlot"); + Plot plot = spy(new MockPlot("MockPlot")); AttributeSet attrs = mock(AttributeSet.class); plot.init(RuntimeEnvironment.application, attrs, 0); - // TODO: verifications + + verify(plot, times(1)).onPreInit(); + verify(plot, times(1)).onAfterConfig(); } @Test diff --git a/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java index 6ed81b7b..bdb48f92 100644 --- a/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java +++ b/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java @@ -14,9 +14,9 @@ import org.mockito.InOrder; import org.mockito.Mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyFloat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyFloat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; diff --git a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java index ce398dc9..cae6c056 100644 --- a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java +++ b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java @@ -21,10 +21,10 @@ import org.mockito.Mockito; import static junit.framework.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -94,9 +94,9 @@ public void draw_sizeChanged_invokesOnResizeBeforeDoOnDraw() { widget.draw(canvas); - inOrder.verify(widget).onResize(isNull(RectF.class), any(RectF.class)); + inOrder.verify(widget).onResize(isNull(), any(RectF.class)); inOrder.verify(widget).doOnDraw(eq(canvas), any(RectF.class)); - verify(widget).onResize(isNull(RectF.class), any(RectF.class)); + verify(widget).onResize(isNull(), any(RectF.class)); } static class TestWidget extends Widget { diff --git a/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java b/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java index b063235a..4454c69c 100644 --- a/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java +++ b/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java @@ -27,9 +27,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyFloat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyFloat; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java index 647882c5..b1600828 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java @@ -24,7 +24,6 @@ import org.junit.*; import org.mockito.*; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; /** diff --git a/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java index e4624d08..08cc1480 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java @@ -33,9 +33,9 @@ import java.util.List; import static junit.framework.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyFloat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyFloat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java index cd0ff2b1..94a0be50 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java @@ -24,7 +24,6 @@ import org.junit.*; import org.mockito.*; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; /** diff --git a/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java index a7fba775..8eda23b9 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java @@ -24,7 +24,6 @@ import org.junit.*; import org.mockito.*; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; public class CandlestickRendererTest extends AndroidplotTest { diff --git a/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java index de81e70c..cf083d9e 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java @@ -24,8 +24,8 @@ import org.junit.runner.*; import org.mockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java b/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java index 3269082d..800992f9 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java @@ -27,7 +27,6 @@ import java.util.*; import static junit.framework.Assert.assertEquals; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; public class LTTBSamplerTest extends AndroidplotTest { diff --git a/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java index 9cb03cd1..44a7b22d 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java @@ -26,7 +26,6 @@ import java.util.*; import static junit.framework.Assert.assertEquals; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; public class LineAndPointRendererTest extends AndroidplotTest { diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java index 5a0da878..a9182501 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java @@ -21,7 +21,6 @@ import com.androidplot.test.*; import com.androidplot.ui.*; -import com.androidplot.util.DisplayDimensions; import org.junit.*; import org.mockito.*; @@ -29,12 +28,11 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyDouble; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyFloat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyFloat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -202,7 +200,6 @@ public void drawCursorLabel_drawsText() { @Test public void setLineLabelEdges_setsEdges() { - graphWidget.setLineLabelEdges(XYGraphWidget.Edge.LEFT, XYGraphWidget.Edge.BOTTOM); assertTrue(graphWidget.isLineLabelEnabled(XYGraphWidget.Edge.LEFT)); assertTrue(graphWidget.isLineLabelEnabled(XYGraphWidget.Edge.BOTTOM)); @@ -312,10 +309,10 @@ public void setGridInsets_updatesGridRect() { private void runDrawGridTest() { doNothing().when(graphWidget). - drawDomainLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean()); + drawDomainLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean(), anyBoolean()); doNothing().when(graphWidget). - drawRangeLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean()); + drawRangeLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean(), anyBoolean()); xyPlot.setRangeBoundaries(0, 100, BoundaryMode.FIXED); xyPlot.setDomainBoundaries(0, 100, BoundaryMode.FIXED); @@ -324,9 +321,9 @@ private void runDrawGridTest() { // expecting a 100x100 grid to be drawn: verify(graphWidget, times(100)) - .drawDomainLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false)); + .drawDomainLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false), anyBoolean()); verify(graphWidget, times(100)) - .drawRangeLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false)); + .drawRangeLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false), anyBoolean()); } } diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java index b50f7237..778fb40a 100644 --- a/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java +++ b/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java @@ -32,11 +32,10 @@ import java.util.List; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/build.gradle b/build.gradle index 69be2080..4b5e18de 100644 --- a/build.gradle +++ b/build.gradle @@ -15,24 +15,25 @@ */ ext { - theCompileSdkVersion = 30 - theTargetSdkVersion = 30 + theCompileSdkVersion = 34 + theTargetSdkVersion = 34 theMinSdkVersion = 5 - theVersionName = '1.5.9' - theVersionCode = 1 + theVersionName = '1.5.11' + theVersionCode = 227 gitUrl = 'https://github.com/halfhp/androidplot.git' } buildscript { repositories { mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' } google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5-SNAPSHOT' + classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.mxalbert.gradle:jacoco-android:0.2.0' } } diff --git a/demoapp-wearable/build.gradle b/demoapp-wearable/build.gradle index 3bfc0ee0..666b353e 100644 --- a/demoapp-wearable/build.gradle +++ b/demoapp-wearable/build.gradle @@ -38,9 +38,10 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 - targetCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } + buildTypes { release { minifyEnabled false diff --git a/demoapp/build.gradle b/demoapp/build.gradle index b8b76251..2c2fbd52 100644 --- a/demoapp/build.gradle +++ b/demoapp/build.gradle @@ -15,7 +15,7 @@ */ buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = '2.0.0' repositories { mavenCentral() } @@ -33,20 +33,25 @@ plugins { apply plugin: 'kotlin-android' dependencies { - implementation "androidx.core:core-ktx:1.6.0" + implementation "androidx.core:core-ktx:1.13.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation project(':androidplot-core') - implementation 'com.crittercism:crittercism-android-agent:5.4.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3' - - releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' +} - testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3' +kotlin { + jvmToolchain(17) } android { + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + compileSdkVersion theCompileSdkVersion buildFeatures { @@ -56,7 +61,7 @@ android { defaultConfig { versionCode theVersionCode versionName theVersionName - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion theTargetSdkVersion applicationId "com.androidplot.demos" } @@ -80,11 +85,11 @@ android { debuggable true } } - - lintOptions { - // TODO: set to true and address all the lint issues. + lint { abortOnError false } + namespace 'com.androidplot.demos' + } play { diff --git a/demoapp/project.properties b/demoapp/project.properties index 29656f2d..90a2cb18 100644 --- a/demoapp/project.properties +++ b/demoapp/project.properties @@ -39,5 +39,3 @@ #proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt # using config with optimization enabled so that things like log statement removal will work: proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt -# Project target. -target=android-16 diff --git a/demoapp/src/main/AndroidManifest.xml b/demoapp/src/main/AndroidManifest.xml index 16245b9f..5b73a2b7 100644 --- a/demoapp/src/main/AndroidManifest.xml +++ b/demoapp/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - + @@ -27,76 +27,88 @@ android:icon="@drawable/ic_launcher"> + android:label="@string/app_name" + android:exported="true"> + android:label="@string/app_name" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> + android:screenOrientation="landscape" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> + android:label="@string/app_name" + android:exported="false"> - + @@ -112,7 +124,8 @@ + android:name="com.androidplot.demos.widget.DemoAppWidgetProvider" + android:exported="false"> diff --git a/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java b/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java index 9c931a73..df3d6117 100644 --- a/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java +++ b/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java @@ -2,20 +2,10 @@ import android.app.*; -import com.squareup.leakcanary.*; - public class DemoApplication extends Application { @Override public void onCreate() { super.onCreate(); - initLeakCanary(); - } - - protected void initLeakCanary() { - if (LeakCanary.isInAnalyzerProcess(this)) { - return; - } - LeakCanary.install(this); } } diff --git a/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt index 6c8320e1..6632af40 100644 --- a/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt +++ b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt @@ -17,29 +17,16 @@ package com.androidplot.demos import android.app.Activity import android.os.Bundle -import com.crittercism.app.Crittercism import android.content.Intent -import android.util.Log import com.androidplot.demos.databinding.MainBinding class MainActivity : Activity() { private lateinit var binding: MainBinding - companion object { - private val TAG = MainActivity::class.java.name - - // DO *NOT* CHANGE THIS LINE! (CI-MATCH-POPULATE) - private val CRITTERCISM_APP_ID: String? = null - } - public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = MainBinding.inflate(layoutInflater) - if (CRITTERCISM_APP_ID != null) { - Log.d(TAG, "Crittercism initialized.") - Crittercism.initialize(applicationContext, CRITTERCISM_APP_ID) - } binding.animatedXYPlotExButton.setOnClickListener { startActivity(Intent(this, AnimatedXYPlotActivity::class.java)) diff --git a/docs/barchart.md b/docs/barchart.md index 7da49957..5b384250 100644 --- a/docs/barchart.md +++ b/docs/barchart.md @@ -118,14 +118,14 @@ The exact size of the `BarGroup` is specified in pixels and the space between ea is dynamically calculated based on that size. ```java -barRenderer.setBarWidth(BarRenderer.BarGroupWidthMode.FIXED_WIDTH, PixelUtils.dpToPix(25)); +barRenderer.setBarGroupWidth(BarRenderer.BarGroupWidthMode.FIXED_WIDTH, PixelUtils.dpToPix(25)); ``` ##### FIXED_GAP The exact size of the "gap" between each `BarGroup` is specified in pixels and the size of each `BarGroup` is dynamically calculated based on that spacing. ```java -barRenderer.setBarWidth(BarRenderer.BarGroupWidthMode.FIXED_GAP, PixelUtils.dpToPix(5)); +barRenderer.setBarGroupWidth(BarRenderer.BarGroupWidthMode.FIXED_GAP, PixelUtils.dpToPix(5)); ``` # Example diff --git a/docs/index.md b/docs/index.md index 4959db92..90a8a021 100644 --- a/docs/index.md +++ b/docs/index.md @@ -42,7 +42,9 @@ Source code examples of the various plot types. # XML Attributes A complete list of XML attributes is [available here](attrs.md). # Javadoc -The latest Javadocs are [available here](https://javadoc.io/doc/com.androidplot/androidplot-core). +Javadocs for versions through 1.5.7 are [available here](https://javadoc.io/doc/com.androidplot/androidplot-core). Due to a build issue +producing Javadocs for the latest releases has been paused. There have been very +few changes to the API since 1.5.7 so the Javadocs should still be useful in the mean time. # Release Notes Full release notes are [available here](release_notes.md) diff --git a/docs/quickstart.md b/docs/quickstart.md index 9dde294d..3bd87c3d 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -14,7 +14,7 @@ To use the library in your gradle project add the following to your build.gradle ```groovy dependencies { - implementation "com.androidplot:androidplot-core:1.5.9" + implementation "com.androidplot:androidplot-core:1.5.11" } ``` diff --git a/docs/release_notes.md b/docs/release_notes.md index 00a80a5c..50d52c11 100644 --- a/docs/release_notes.md +++ b/docs/release_notes.md @@ -2,6 +2,14 @@ For details on what to expect in general when updating to a new version of Androiplot, check out the [versioning doc](versioning.md). +# 1.5.11 +* Update project to latest gradle / build tools +* Fix issue with jetifier flagging an outdated dependency + +# 1.5.10 +* Update project to use latest gradle / build tools +* (#114) fix `setLinesPerRangeLabel` & `setLinesPerDomainLabel` + # 1.5.9 * (#107) Fix ambiguous ordinal for render mode attributes * (#104) Fix issue with background rendering in RecyclerView. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0a24689e..e9defc20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip diff --git a/misc/download_keystore.sh b/misc/download_keystore.sh deleted file mode 100755 index 99fd503a..00000000 --- a/misc/download_keystore.sh +++ /dev/null @@ -1,9 +0,0 @@ -# use curl to download a keystore from $KEYSTORE_URI, if set, -# to the path/filename set in $KEYSTORE. -if [[ $KEYSTORE && ${KEYSTORE} && $KEYSTORE_URI && ${KEYSTORE_URI} ]] -then - echo "Keystore detected - downloading..." - curl -L -o ${KEYSTORE} ${KEYSTORE_URI} -else - echo "Keystore uri not set. .APK artifact will not be signed." -fi \ No newline at end of file