Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Warnings in Gradle files #35

Merged
merged 2 commits into from
Aug 25, 2023
Merged
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
6 changes: 3 additions & 3 deletions code/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ spotless {
}

android {
compileSdkVersion rootProject.compileSdkVersion
compileSdk rootProject.compileSdk

defaultConfig {
applicationId "com.adobe.marketing.mobile.audiencetestapp"
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
minSdk rootProject.minSdk
targetSdk rootProject.targetSdk
versionCode 1
versionName "1.0"
}
Expand Down
44 changes: 24 additions & 20 deletions code/audience/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jacoco {
android {
namespace 'com.adobe.marketing.mobile.audience'

compileSdkVersion rootProject.ext.compileSdkVersion
compileSdk rootProject.ext.compileSdk

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
minSdk rootProject.ext.minSdk
targetSdk rootProject.ext.targetSdk

testInstrumentationRunner rootProject.ext.testInstrumentationRunner
}

flavorDimensions "target"
flavorDimensions = ["target"]
productFlavors {
phone {
dimension "target"
Expand Down Expand Up @@ -74,30 +74,32 @@ spotless {

// Javadocs settings
afterEvaluate {
tasks.withType(Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
classpath += files(android.libraryVariants.collect { variant ->
variant.javaCompileProvider.get().classpath.files
})
options {
source = "8"
links "https://developer.android.com/reference"
tasks.withType(Javadoc).tap {
configureEach {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
classpath += files(android.libraryVariants.collect { variant ->
variant.javaCompileProvider.get().classpath.files
})
options {
source = "8"
links "https://developer.android.com/reference"
}
}
}
}

task javadocInternal(type: Javadoc) {
tasks.register('javadocInternal', Javadoc) {
destinationDir = reporting.file("javadocInternal")
options.memberLevel = JavadocMemberLevel.PRIVATE
}

task javadocPublic(type: Javadoc) {
tasks.register('javadocPublic', Javadoc) {
destinationDir = reporting.file("javadocPublic")
options.memberLevel = JavadocMemberLevel.PUBLIC
}

task javadocPublish(type: Jar) {
tasks.register('javadocPublish', Jar) {
from javadocPublic
archiveClassifier.set('javadoc')
}
Expand Down Expand Up @@ -178,7 +180,8 @@ signing {

// Jacoco reports

task platformUnitTestJacocoReport(type: JacocoReport, dependsOn: "testPhoneDebugUnitTest") {
tasks.register('platformUnitTestJacocoReport', JacocoReport) {
dependsOn "testPhoneDebugUnitTest"
def excludeRegex = ['**/BuildConfig.class']
def debugTree = fileTree(dir: "${project.buildDir}/intermediates/javac/phoneDebug/classes/com/adobe/marketing/mobile", excludes: excludeRegex)

Expand All @@ -197,7 +200,8 @@ task platformUnitTestJacocoReport(type: JacocoReport, dependsOn: "testPhoneDebug
}
}

task platformFunctionalTestJacocoReport(type: JacocoReport, dependsOn: "createPhoneDebugCoverageReport") {
tasks.register('platformFunctionalTestJacocoReport', JacocoReport) {
dependsOn "createPhoneDebugCoverageReport"
def excludeRegex = ['**/BuildConfig.class']
def debugTree = fileTree(dir: "${project.buildDir}/intermediates/javac/phoneDebug/classes/com/adobe/marketing/mobile", excludes: excludeRegex)

Expand All @@ -216,13 +220,13 @@ task platformFunctionalTestJacocoReport(type: JacocoReport, dependsOn: "createPh
}
}

tasks.withType(Test) {
tasks.withType(Test).configureEach {
testLogging {
showStandardStreams = true
}
}

configurations.all {
configurations.configureEach {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}

Expand Down
8 changes: 4 additions & 4 deletions code/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ moduleVersion=rootProject.moduleVersion

ext {
// android config
minSdkVersion = 19
targetSdkVersion = 33
compileSdkVersion = 33
minSdk = 19
targetSdk = 33
compileSdk = 33
versionCode = 1
versionName = "2.0.0"

Expand All @@ -44,6 +44,6 @@ ext {
jacocoVersion = "0.8.8"
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}