Skip to content

Fix issue tasks/tasks#2870 #1

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.

Sign up for GitHub

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

Merged
abaker merged 5 commits into from
Jun 2, 2025
Merged

Fix issue tasks/tasks#2870 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f26379
Update dependencies ical4j (3.2.19) and gradle (8.10.1)
devn1x Jun 2, 2025
4b1a4a8
Add android.buildFeatures.buildConfig
devn1x Jun 2, 2025
254c4c2
Revert "task list is not optional"
devn1x Jun 2, 2025
a790628
Uncomment task.userAgents
devn1x Jun 2, 2025
fbc1b26
Update comment
devn1x Jun 2, 2025
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
14 changes: 9 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
ext.versions = [
kotlin: '1.7.21',
dokka: '1.7.20',
ical4j: '3.2.7',
ical4j: '3.2.19',
// latest Apache Commons versions that don't require Java 8 (Android 7)
commonsIO: '2.6'
]
Expand All @@ -17,7 +17,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.10.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
}
Expand All @@ -42,7 +42,7 @@ android {

defaultConfig {
minSdkVersion 21 // Android 5.0
targetSdkVersion 32 // Android 12
targetSdkVersion 33 // Android 13

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down Expand Up @@ -73,6 +73,10 @@ android {
sourceSets {
main.java.srcDirs = [ "src/main/java", "opentasks-contract/src/main/java" ]
}

buildFeatures {
buildConfig = true
}
}

dependencies {
Expand All @@ -89,9 +93,9 @@ dependencies {
}
// ical4j requires newer Apache Commons libraries, which require Java8. Force latest Java7 versions.
// noinspection GradleDependency
api("org.apache.commons:commons-collections4:4.2") { force = true }
api("org.apache.commons:commons-collections4:4.2")
// noinspection GradleDependency
api("org.apache.commons:commons-lang3:3.8.1") { force = true }
api("org.apache.commons:commons-lang3:3.8.1")

// noinspection GradleDependency
implementation "commons-io:commons-io:${versions.commonsIO}"
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Mon Jun 02 17:38:23 CEST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion src/main/java/at/bitfire/ical4android/AndroidTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ import java.util.logging.Level
*
*/
abstract class AndroidTask(
val taskList: AndroidTaskList<AndroidTask>
private val taskListOpt: AndroidTaskList<AndroidTask>?
) {

val taskList: AndroidTaskList<AndroidTask>
get() = taskListOpt!!

companion object {
const val UNKNOWN_PROPERTY_DATA = Properties.DATA0

Expand Down