Skip to content

Commit 3fa99fd

Browse files
authored
Fix issue tasks/tasks#2870 (#1)
* Update dependencies ical4j (3.2.19) and gradle (8.10.1) * Add android.buildFeatures.buildConfig * Revert "task list is not optional" This reverts commit 3fbd449. * Uncomment task.userAgents * Update comment
1 parent 3fbd449 commit 3fa99fd

3 files changed

Lines changed: 15 additions & 7 deletions

File tree

build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
ext.versions = [
77
kotlin: '1.7.21',
88
dokka: '1.7.20',
9-
ical4j: '3.2.7',
9+
ical4j: '3.2.19',
1010
// latest Apache Commons versions that don't require Java 8 (Android 7)
1111
commonsIO: '2.6'
1212
]
@@ -17,7 +17,7 @@ buildscript {
1717
}
1818

1919
dependencies {
20-
classpath 'com.android.tools.build:gradle:7.3.1'
20+
classpath 'com.android.tools.build:gradle:8.10.1'
2121
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
2222
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
2323
}
@@ -42,7 +42,7 @@ android {
4242

4343
defaultConfig {
4444
minSdkVersion 21 // Android 5.0
45-
targetSdkVersion 32 // Android 12
45+
targetSdkVersion 33 // Android 13
4646

4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4848

@@ -73,6 +73,10 @@ android {
7373
sourceSets {
7474
main.java.srcDirs = [ "src/main/java", "opentasks-contract/src/main/java" ]
7575
}
76+
77+
buildFeatures {
78+
buildConfig = true
79+
}
7680
}
7781

7882
dependencies {
@@ -89,9 +93,9 @@ dependencies {
8993
}
9094
// ical4j requires newer Apache Commons libraries, which require Java8. Force latest Java7 versions.
9195
// noinspection GradleDependency
92-
api("org.apache.commons:commons-collections4:4.2") { force = true }
96+
api("org.apache.commons:commons-collections4:4.2")
9397
// noinspection GradleDependency
94-
api("org.apache.commons:commons-lang3:3.8.1") { force = true }
98+
api("org.apache.commons:commons-lang3:3.8.1")
9599

96100
// noinspection GradleDependency
97101
implementation "commons-io:commons-io:${versions.commonsIO}"
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Mon Jun 02 17:38:23 CEST 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

src/main/java/at/bitfire/ical4android/AndroidTask.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ import java.util.logging.Level
4343
*
4444
*/
4545
abstract class AndroidTask(
46-
val taskList: AndroidTaskList<AndroidTask>
46+
private val taskListOpt: AndroidTaskList<AndroidTask>?
4747
) {
4848

49+
val taskList: AndroidTaskList<AndroidTask>
50+
get() = taskListOpt!!
51+
4952
companion object {
5053
const val UNKNOWN_PROPERTY_DATA = Properties.DATA0
5154

0 commit comments

Comments
 (0)