Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
java: [11, 17]
java: [17]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
java: [17]
java: [17, 21]

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@jo-elimu I'll do this in separate changes since the main purpose of this PR is to resolve build error because of Jacoco plugin.
Anyway, some notes regarding this:
1/ Since Android Gradle build tool is currently 8.0.x, building with Java 21 will fail because it's unsupported yet with this version.
2/ Upgrading Android Gradle build tool to 8.5.x will probably cause build to fail because the new Jacoco plugin doesn't seem to support Gradle 8.5 yet.

So, for now. we should merge this PR and look for solution of this in another one.

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down
12 changes: 8 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
apply plugin: 'com.dicedmelon.gradle.jacoco-android'
apply plugin: 'com.mxalbert.gradle.jacoco-android'

jacoco {
toolVersion = "0.8.4"
toolVersion = "0.8.10"
}

android {
Expand All @@ -20,8 +20,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildTypes {
Expand All @@ -47,6 +47,10 @@ android {
buildConfigField("String", "ANALYTICS_APPLICATION_ID", '"ai.elimu.analytics"')
}
}

buildFeatures {
buildConfig = true
}
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath 'com.mxalbert.gradle:jacoco-android:0.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Fri Feb 25 16:17:50 PST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading