Rename dav4android to dav4jvm; update gradle

2024-07-21 18:51:52 +00:00 · 2019-01-06 18:15:59 +01:00 · 2019-01-06 18:15:59 +01:00 · 2fe19e9342
parent e764d31d18
commit 2fe19e9342
24 changed files with 65 additions and 67 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,6 @@
-[submodule "dav4android"]
-	path = dav4android
-	url = ../dav4android.git
+[submodule "dav4jvm"]
+	path = dav4jvm
+	url = ../dav4jvm.git
 [submodule "ical4android"]
 	path = ical4android
 	url = ../ical4android.git
--- a/app/build.gradle
+++ b/app/build.gradle
@ -67,7 +67,7 @@ android {

 dependencies {
    implementation project(':cert4android')
-    implementation project(':dav4android')
+    implementation project(':dav4jvm')
    implementation project(':ical4android')
    implementation project(':vcard4android')

--- a/app/src/main/java/at/bitfire/davdroid/DavService.kt
+++ b/app/src/main/java/at/bitfire/davdroid/DavService.kt
@ -20,12 +20,12 @@ import android.os.Binder
 import android.os.Bundle
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.Response
-import at.bitfire.dav4android.UrlUtils
-import at.bitfire.dav4android.exception.DavException
-import at.bitfire.dav4android.exception.HttpException
-import at.bitfire.dav4android.property.*
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.UrlUtils
+import at.bitfire.dav4jvm.exception.DavException
+import at.bitfire.dav4jvm.exception.HttpException
+import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.model.CollectionInfo
 import at.bitfire.davdroid.model.ServiceDB.*
--- a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
+++ b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt
@ -12,9 +12,9 @@ import android.content.Context
 import android.os.Build
 import android.security.KeyChain
 import at.bitfire.cert4android.CustomCertManager
-import at.bitfire.dav4android.BasicDigestAuthHandler
-import at.bitfire.dav4android.Constants
-import at.bitfire.dav4android.UrlUtils
+import at.bitfire.dav4jvm.BasicDigestAuthHandler
+import at.bitfire.dav4jvm.Constants
+import at.bitfire.dav4jvm.UrlUtils
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.model.Credentials
 import at.bitfire.davdroid.settings.AccountSettings
@ -226,7 +226,7 @@ class HttpClient private constructor(
        // use Locale.US because numbers may be encoded as non-ASCII characters in other locales
        private val userAgentDateFormat = SimpleDateFormat("yyyy/MM/dd", Locale.US)
        private val userAgentDate = userAgentDateFormat.format(Date(BuildConfig.buildTime))
-        private val userAgent = "DAVx5/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4android; okhttp/${Constants.okHttpVersion}) Android/${Build.VERSION.RELEASE}"
+        private val userAgent = "DAVx5/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4android; okhttp/${Constants.okhttpVersion}) Android/${Build.VERSION.RELEASE}"

        override fun intercept(chain: Interceptor.Chain): Response {
            val locale = Locale.getDefault()
--- a/app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.kt
+++ b/app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.kt
@ -11,9 +11,9 @@ package at.bitfire.davdroid.model
 import android.content.ContentValues
 import android.os.Parcel
 import android.os.Parcelable
-import at.bitfire.dav4android.Response
-import at.bitfire.dav4android.UrlUtils
-import at.bitfire.dav4android.property.*
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.UrlUtils
+import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.model.ServiceDB.Collections
 import okhttp3.HttpUrl

--- a/app/src/main/java/at/bitfire/davdroid/model/SyncState.kt
+++ b/app/src/main/java/at/bitfire/davdroid/model/SyncState.kt
@ -8,7 +8,7 @@

 package at.bitfire.davdroid.model

-import at.bitfire.dav4android.property.SyncToken
+import at.bitfire.dav4jvm.property.SyncToken
 import org.json.JSONException
 import org.json.JSONObject

--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt
@ -20,7 +20,7 @@ import android.provider.ContactsContract.CommonDataKinds.GroupMembership
 import android.provider.ContactsContract.Groups
 import android.provider.ContactsContract.RawContacts
 import android.provider.ContactsContract.RawContacts.Data
-import at.bitfire.dav4android.Constants
+import at.bitfire.dav4jvm.Constants
 import at.bitfire.vcard4android.*
 import java.util.*

--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
@ -12,12 +12,12 @@ import android.accounts.Account
 import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
-import at.bitfire.dav4android.DavCalendar
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.DavResponseCallback
-import at.bitfire.dav4android.Response
-import at.bitfire.dav4android.exception.DavException
-import at.bitfire.dav4android.property.*
+import at.bitfire.dav4jvm.DavCalendar
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.exception.DavException
+import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.model.SyncState
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
@ -14,12 +14,12 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.ContactsContract.Groups
 import androidx.core.app.NotificationCompat
-import at.bitfire.dav4android.DavAddressBook
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.DavResponseCallback
-import at.bitfire.dav4android.Response
-import at.bitfire.dav4android.exception.DavException
-import at.bitfire.dav4android.property.*
+import at.bitfire.dav4jvm.DavAddressBook
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.exception.DavException
+import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.R
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
@ -18,15 +18,13 @@ import android.provider.CalendarContract
 import android.provider.ContactsContract
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import at.bitfire.dav4android.*
-import at.bitfire.dav4android.exception.*
-import at.bitfire.dav4android.property.GetCTag
-import at.bitfire.dav4android.property.GetETag
-import at.bitfire.dav4android.property.SyncToken
+import at.bitfire.dav4jvm.*
+import at.bitfire.dav4jvm.exception.*
+import at.bitfire.dav4jvm.property.GetCTag
+import at.bitfire.dav4jvm.property.GetETag
+import at.bitfire.dav4jvm.property.SyncToken
 import at.bitfire.davdroid.*
-import at.bitfire.davdroid.BuildConfig
 import at.bitfire.davdroid.Constants
-import at.bitfire.davdroid.R
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.model.SyncState
 import at.bitfire.davdroid.resource.*
@ -454,7 +452,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
                return@listRemote

            // ignore collections
-            if (response[at.bitfire.dav4android.property.ResourceType::class.java]?.types?.contains(at.bitfire.dav4android.property.ResourceType.COLLECTION) == true)
+            if (response[at.bitfire.dav4jvm.property.ResourceType::class.java]?.types?.contains(at.bitfire.dav4jvm.property.ResourceType.COLLECTION) == true)
                return@listRemote

            val name = response.hrefName()
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
@ -12,15 +12,15 @@ import android.accounts.Account
 import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
-import at.bitfire.dav4android.DavCalendar
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.DavResponseCallback
-import at.bitfire.dav4android.Response
-import at.bitfire.dav4android.exception.DavException
-import at.bitfire.dav4android.property.CalendarData
-import at.bitfire.dav4android.property.GetCTag
-import at.bitfire.dav4android.property.GetETag
-import at.bitfire.dav4android.property.SyncToken
+import at.bitfire.dav4jvm.DavCalendar
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.exception.DavException
+import at.bitfire.dav4jvm.property.CalendarData
+import at.bitfire.dav4jvm.property.GetCTag
+import at.bitfire.dav4jvm.property.GetETag
+import at.bitfire.dav4jvm.property.SyncToken
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.model.SyncState
--- a/app/src/main/java/at/bitfire/davdroid/ui/CreateCollectionFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/CreateCollectionFragment.kt
@ -17,8 +17,8 @@ import androidx.fragment.app.DialogFragment
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.AsyncTaskLoader
 import androidx.loader.content.Loader
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.XmlUtils
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.XmlUtils
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.R
--- a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt
@ -34,7 +34,7 @@ import androidx.core.content.pm.PackageInfoCompat
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.AsyncTaskLoader
 import androidx.loader.content.Loader
-import at.bitfire.dav4android.exception.HttpException
+import at.bitfire.dav4jvm.exception.HttpException
 import at.bitfire.davdroid.BuildConfig
 import at.bitfire.davdroid.InvalidAccountException
 import at.bitfire.davdroid.R
--- a/app/src/main/java/at/bitfire/davdroid/ui/DeleteCollectionFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/DeleteCollectionFragment.kt
@ -18,7 +18,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.AsyncTaskLoader
 import androidx.loader.content.Loader
-import at.bitfire.dav4android.DavResource
+import at.bitfire.dav4jvm.DavResource
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.model.CollectionInfo
--- a/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt
@ -14,7 +14,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
-import at.bitfire.dav4android.exception.HttpException
+import at.bitfire.dav4jvm.exception.HttpException
 import at.bitfire.davdroid.R
 import java.io.IOException

--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt
@ -13,12 +13,12 @@ import android.content.Context
 import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.Response
-import at.bitfire.dav4android.UrlUtils
-import at.bitfire.dav4android.exception.DavException
-import at.bitfire.dav4android.exception.HttpException
-import at.bitfire.dav4android.property.*
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.UrlUtils
+import at.bitfire.dav4jvm.exception.DavException
+import at.bitfire.dav4jvm.exception.HttpException
+import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.HttpClient
 import at.bitfire.davdroid.log.StringHandler
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt
@ -18,7 +18,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.CompoundButton
 import androidx.fragment.app.Fragment
-import at.bitfire.dav4android.Constants
+import at.bitfire.dav4jvm.Constants
 import at.bitfire.davdroid.R
 import kotlinx.android.synthetic.main.login_credentials_fragment.view.*
 import java.net.IDN
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 960d33c71956e96decb9699b589427989e501f51
+Subproject commit 75dafa4397aacd98efda846818ad3c23367bcf05
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit f2078bc846f1b704680904c415e95ce8a9c9f672
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit f0c3fd540f4b94ad88488ad384433192ae41bf77
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit fef93f94bbc1265e53e55c95fe86e8c33e2e4f0f
+Subproject commit 7c49ba213d823fcb3b06c567227d53e723864043
--- a/settings.gradle
+++ b/settings.gradle
@ -1,5 +1,5 @@
 include ':app'
-include ':dav4android'
+include ':cert4android'
+include ':dav4jvm'
 include ':ical4android'
 include ':vcard4android'
-include ':cert4android'
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 42d5cc3f8b16c628fa13a5a3b0f211e6660fb084
+Subproject commit 9af8952aebdd0abb8408f9e467e160bb4c287c1f
				`@ -1 +0,0 @@`
				`Subproject commit f2078bc846f1b704680904c415e95ce8a9c9f672`
				`@ -0,0 +1 @@`
				`Subproject commit f0c3fd540f4b94ad88488ad384433192ae41bf77`