Merge branch 'upstream/master' into 1720-Update_to_upstream (942bfdc0) · Commits · e / os / ical4android

.github/workflows/dependent-issues.yml

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		name: Dependent Issues

		on:
		issues:
		types:
		- opened
		- edited
		- closed
		- reopened
		pull_request_target:
		types:
		- opened
		- edited
		- closed
		- reopened
		# Makes sure we always add status check for PRs. Useful only if
		# this action is required to pass before merging. Otherwise, it
		# can be removed.
		- synchronize

		# Schedule a daily check. Useful if you reference cross-repository
		# issues or pull requests. Otherwise, it can be removed.
		schedule:
		- cron: '12 9 * * *'

		permissions: write-all

		jobs:
		check:
		runs-on: ubuntu-latest
		steps:
		- uses: z0al/dependent-issues@v1
		env:
		# (Required) The token to use to make API calls to GitHub.
		GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
		# (Optional) The token to use to make API calls to GitHub for remote repos.
		GITHUB_READ_TOKEN: ${{ secrets.DEPENDENT_ISSUES_READ_TOKEN }}

		with:
		# (Optional) The label to use to mark dependent issues
		# label: dependent

		# (Optional) Enable checking for dependencies in issues.
		# Enable by setting the value to "on". Default "off"
		check_issues: on

		# (Optional) A comma-separated list of keywords. Default
		# "depends on, blocked by"
		keywords: depends on, blocked by

		# (Optional) A custom comment body. It supports `{{ dependencies }}` token.
		comment: >
		This PR/issue depends on:

		{{ dependencies }}

.github/workflows/test-dev.yml

+7 −3

Original line number	Diff line number	Diff line
		@@ -67,6 +67,10 @@ jobs:

		- name: Install task apps and run tests
		uses: reactivecircus/android-emulator-runner@v2
		env:
		version_at_techbee_jtx: 205020009
		version_org_tasks: 130501
		version_org_dmfs_tasks: 82200
		with:
		api-level: ${{ matrix.api-level }}
		arch: x86_64
		@@ -75,9 +79,9 @@ jobs:
		disable-animations: true
		script: \|
		mkdir .apk && cd .apk
		wget -cq -O org.dmfs.tasks.apk https://f-droid.org/archive/org.dmfs.tasks_80800.apk && adb install org.dmfs.tasks.apk
		wget -cq -O org.tasks.apk https://f-droid.org/archive/org.tasks_120400.apk && adb install org.tasks.apk
		wget -cq -O at.techbee.jtx.apk https://f-droid.org/archive/at.techbee.jtx_100140002.apk && adb install at.techbee.jtx.apk
		(wget -cq -O org.dmfs.tasks.apk https://f-droid.org/repo/org.dmfs.tasks_${{ env.version_org_dmfs_tasks }}.apk \|\| wget -cq -O org.dmfs.tasks.apk https://f-droid.org/archive/org.dmfs.tasks_${{ env.version_org_dmfs_tasks }}.apk) && adb install org.dmfs.tasks.apk
		(wget -cq -O org.tasks.apk https://f-droid.org/repo/org.tasks_${{ env.version_org_tasks }}.apk \|\| wget -cq -O org.tasks.apk https://f-droid.org/archive/org.tasks_${{ env.version_org_tasks }}.apk) && adb install org.tasks.apk
		(wget -cq -O at.techbee.jtx.apk https://f-droid.org/repo/at.techbee.jtx_${{ env.version_at_techbee_jtx }}.apk \|\| wget -cq -O at.techbee.jtx.apk https://f-droid.org/archive/at.techbee.jtx_${{ env.version_at_techbee_jtx }}.apk) && adb install at.techbee.jtx.apk
		cd ..
		./gradlew --no-daemon connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest

build.gradle.kts

+3 −3

Original line number	Diff line number	Diff line
		@@ -3,9 +3,9 @@
		**************************************************************************************************/

		plugins {
		id("com.android.library") version "8.0.1" apply false
		id("org.jetbrains.kotlin.android") version "1.8.21" apply false
		id("org.jetbrains.dokka") version "1.8.10" apply false
		id("com.android.library") version "8.1.0" apply false
		id("org.jetbrains.kotlin.android") version "1.9.0" apply false
		id("org.jetbrains.dokka") version "1.8.20" apply false
		}

		group = "at.bitfire"

lib/build.gradle.kts

+4 −5

Original line number	Diff line number	Diff line
		@@ -9,12 +9,11 @@ plugins {
		id("org.jetbrains.dokka")
		}


		val version_ical4j = "3.2.11"
		val version_ical4j = "3.2.13"

		val versionMajor = 1
		val versionMinor = 1
		val versionPatch = 1
		val versionPatch = 2

		val versionName = "${versionMajor}.${versionMinor}.${versionPatch}"
		val baseName = "ical4android-$versionName"
		@@ -132,7 +131,7 @@ dependencies {

		implementation("androidx.core:core-ktx:1.10.1")
		api("org.mnode.ical4j:ical4j:${version_ical4j}")
		implementation("org.slf4j:slf4j-jdk14:2.0.3") // ical4j logging over java.util.Logger
		implementation("org.slf4j:slf4j-jdk14:2.0.7") // ical4j logging over java.util.Logger

		// ical4j requires newer Apache Commons libraries, which require Java8. Force latest Java7 versions.
		// noinspection GradleDependency
		@@ -154,6 +153,6 @@ dependencies {
		androidTestImplementation("androidx.test:core:1.5.0")
		androidTestImplementation("androidx.test:runner:1.5.2")
		androidTestImplementation("androidx.test:rules:1.5.0")
		androidTestImplementation("io.mockk:mockk-android:1.13.4")
		androidTestImplementation("io.mockk:mockk-android:1.13.7")
		testImplementation("junit:junit:4.13.2")
		}
		No newline at end of file

lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt

+4 −8

Original line number	Diff line number	Diff line
		@@ -16,17 +16,13 @@ import androidx.test.platform.app.InstrumentationRegistry
		import androidx.test.rule.GrantPermissionRule
		import at.bitfire.ical4android.impl.TestCalendar
		import at.bitfire.ical4android.impl.TestEvent
		import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat
		import at.bitfire.ical4android.util.MiscUtils.UriHelper.asSyncAdapter
		import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
		import at.bitfire.ical4android.util.MiscUtils.closeCompat
		import net.fortuna.ical4j.model.property.DtEnd
		import net.fortuna.ical4j.model.property.DtStart
		import org.junit.AfterClass
		import org.junit.*
		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertNotNull
		import org.junit.Before
		import org.junit.BeforeClass
		import org.junit.ClassRule
		import org.junit.Test

		class AndroidCalendarTest {

		@@ -121,7 +117,7 @@ class AndroidCalendarTest {
		}

		private fun countColors(account: Account): Int {
		val uri = Colors.CONTENT_URI.asSyncAdapter(testAccount)
		val uri = Colors.CONTENT_URI.asSyncAdapter(account)
		provider.query(uri, null, null, null, null)!!.use { cursor ->
		cursor.moveToNext()
		return cursor.count