diff --git a/build.gradle b/build.gradle index 2d58854..6cddfd7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,23 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.61' + + ext.kotlin_version = '1.5.21' + repositories { google() - jcenter() - + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - classpath "com.github.dcendents:android-maven-gradle-plugin:2.1" } } allprojects { repositories { google() - jcenter() - + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ef3358..804681e 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-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/linegraph/build.gradle b/linegraph/build.gradle index 0eb0b1f..aed8ac5 100644 --- a/linegraph/build.gradle +++ b/linegraph/build.gradle @@ -1,16 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'com.jfrog.bintray' -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'maven-publish' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { minSdkVersion 14 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" + targetSdkVersion 30 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -28,65 +24,9 @@ android { } - -task generateSourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier 'sources' -} - -task generateJavadocs(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath() - .join(File.pathSeparator)) -} - -task generateJavadocsJar(type: Jar) { - from generateJavadocs.destinationDir - classifier 'javadoc' -} - -generateJavadocsJar.dependsOn generateJavadocs - -artifacts { - archives generateJavadocsJar - archives generateSourcesJar -} -tasks.withType(Javadoc).all { - enabled = false -} -group = 'ir.farshid_roohi' -version = '0.1.3' - -bintray { - user = 'xxxx' - key = 'xxxx' - pkg { - - repo = 'LineGraph' - name = 'LineGraph' - userOrg = '' - - version { - name = '0.1.3' - desc = 'Line Graph Android' - released = new Date() - vcsTag = '0.1.3' - } - - licenses = ['Apache-2.0'] - vcsUrl = 'https://github.com/FarshidRoohi/LineGraph' - websiteUrl = 'http://farshid-roohi.ir' - } - configurations = ['archives'] -} - - dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.1.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.core:core-ktx:1.6.0' } diff --git a/sample/build.gradle b/sample/build.gradle index 85898b7..9cc3f5f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,15 +1,12 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { applicationId "ir.farshid_roohi.graph" minSdkVersion 14 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -25,13 +22,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation project(":linegraph") } diff --git a/sample/src/main/java/ir/farshid_roohi/graph/MainActivity.kt b/sample/src/main/java/ir/farshid_roohi/graph/MainActivity.kt index 478bd2b..6773e66 100644 --- a/sample/src/main/java/ir/farshid_roohi/graph/MainActivity.kt +++ b/sample/src/main/java/ir/farshid_roohi/graph/MainActivity.kt @@ -5,7 +5,6 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import ir.farshid_roohi.linegraph.ChartEntity import ir.farshid_roohi.linegraph.LineChart -import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { @@ -20,6 +19,8 @@ class MainActivity : AppCompatActivity() { add(firstChartEntity) add(secondChartEntity) } + + val lineChart = findViewById(R.id.lineChart) lineChart.setLegend(legendArr) lineChart.setList(list) }