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
4 changes: 4 additions & 0 deletions android/android.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ android {
targetCompatibility JavaVersion.toVersion(CONFIG.versions.java)
}

buildFeatures {
buildConfig = true
}

testOptions.unitTests.all {
maxParallelForks 2

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/test/resources/build_script_dependency.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath "com.android.tools.build:gradle:${CONFIG.versions.android.plugin}"
}
}
12 changes: 8 additions & 4 deletions publish/android.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
apply from: "$CONFIG.configDir/publish/base-artifact.gradle"

android {

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the objective of adding this block here ?
What is the issue if we don't have it i.e. why do we need it ?

publishing {
singleVariant("release") {
withSourcesJar()
}
}
}

task androidSourceJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
archiveClassifier = 'sources'
Expand All @@ -10,9 +18,5 @@ ext.androidArtifact = { Map config ->

return baseArtifact(config) << {
from config.get('from') ?: components.release

if (!config.get('excludeSourceJar')) {
artifact androidSourceJar
}
}
}
8 changes: 4 additions & 4 deletions quality/jacoco/android.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ def addJacocoTask(variant) {
jacocoTask.description = "Generate Jacoco Report for variant $variantName"

jacocoTask.reports {
csv.enabled false
html.enabled true
xml.enabled true
csv.required = false
html.required = true
xml.required = true
}

def excludedFiles = [
Expand All @@ -56,7 +56,7 @@ def addJacocoTask(variant) {
sourceDirectories.from(files(variant.sourceSets.kotlin.srcDirs.flatten()))
def kotlinTask = tasks.getByName("compile${variantName}Kotlin")
if(kotlinTask) {
classDirectories += fileTree(dir: kotlinTask.destinationDir, excludes: excludedFiles)
classDirectories += fileTree(dir: kotlinTask.destinationDirectory.get(), excludes: excludedFiles)
}
}

Expand Down
10 changes: 5 additions & 5 deletions versions/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// than the consumer applications.
ext.CONFIG.versions = [
// Java compatibility target version
java : '11',
kotlin : '1.5.21',
java : '17',
kotlin : '1.8.0',

// Android plugins, tools, SDK and libraries
android : [
Expand All @@ -16,10 +16,10 @@ ext.CONFIG.versions = [
support : '26.0.0',
volley : '1.1.1',
],
plugin: '7.2.0',
plugin: '8.6.0',
sdk : [
compile: 31,
target : 31,
compile: 35,
target : 35,
min : 23,
],
],
Expand Down