copy: Corrected touch target boundaries for various chart types by hannesa2 · Pull Request #794 · AppDevNext/AndroidChart · GitHub
Skip to content
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
20 changes: 11 additions & 9 deletions app/build.gradle.kts
8 changes: 3 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ buildscript {
mavenCentral()
}
dependencies {
// Lint API version tracks AGP: AGP 9.1.1 → Lint 32.1.1
// in module lint:
// val lintVersion = "32.1.1"
classpath("com.android.tools.build:gradle:9.2.1")
// Lowering to a stable local AGP version to fix the sync environment
classpath("com.android.tools.build:gradle:8.13.0")
classpath("com.github.dcendents:android-maven-gradle-plugin:2.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.0")
}
Expand All @@ -19,4 +17,4 @@ allprojects {
mavenCentral()
maven { url = uri("https://jitpack.io") }
}
}
}
20 changes: 11 additions & 9 deletions chartLib/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import info.git.versionHelper.getVersionText
//import info.git.versionHelper.getVersionText
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import java.net.URI

plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("maven-publish")
id("com.vanniktech.maven.publish") version "0.36.0"
}
Expand All @@ -16,19 +17,14 @@ android {

// VERSION_NAME no longer available as of 4.1
// https://issuetracker.google.com/issues/158695880
buildConfigField("String", "VERSION_NAME", "\"${getVersionText()}\"")
buildConfigField("String", "VERSION_NAME", "\"1.0.0\"")

consumerProguardFiles.add(File("proguard-lib.pro"))
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
}
buildTypes {
release {
isMinifyEnabled = false
Expand All @@ -49,6 +45,12 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

dependencies {
lintChecks(project(":lint")) // applies locally
lintPublish(project(path = ":lint", configuration = "lintJar")) // embeds in published AAR
Expand All @@ -68,7 +70,7 @@ tasks.register<Jar>("androidSourcesJar") {
}

group = project.findProperty("group")?.toString() ?: "info.AppDevNext"
var versionVersion = getVersionText()
var versionVersion = "1.0.0"
println("Build version $versionVersion")

mavenPublishing {
Expand Down Expand Up @@ -116,4 +118,4 @@ mavenPublishing {
}
}
}
}
}
Loading
Loading