Merge remote-tracking branch 'upstream/master'

.github/workflows/android.yml

@@ -9,5 +9,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
       - name: Run tests
         run: ./gradlew lint test

README.md

@@ -42,3 +42,6 @@ Originally forked from [Sardine](https://github.com/lookfirst/sardine)
 [Apache HTTP Client](http://hc.apache.org/) was replaced by [OkHttp](https://github.com/square/okhttp)
 
 JAXB was replaced by [SimpleXml](http://simple.sourceforge.net/)
+
+## Alternatives
+See [Awesome WebDAV: Java libraries](https://github.com/WebDAVDevs/awesome-webdav/blob/main/readme.md#java)

build.gradle

@@ -1,37 +1,66 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
     google()
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 19
         consumerProguardFiles 'proguard-rules.pro'
     }
+    namespace "com.thegrizzlylabs.sardineandroid"
+
+    def javaVersion = JavaVersion.VERSION_17
+    compileOptions {
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
+    }
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
 }
 
 dependencies {
-    api 'com.squareup.okhttp3:okhttp:4.9.0'
+    api 'com.squareup.okhttp3:okhttp:4.12.0'
 
-    implementation ('org.simpleframework:simple-xml:2.7.1') {
+    implementation('org.simpleframework:simple-xml:2.7.1') {
         exclude module: 'stax'
         exclude module: 'stax-api'
         exclude module: 'xpp3'
     }
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
 }
+//fixme uncomment this for print deprecation info
+//tasks.withType(JavaCompile) {
+//    options.compilerArgs =
+//            options.compilerArgs + ["-Xlint:deprecation", "-Xlint:unchecked"]
+//}
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                afterEvaluate {
+                    from components.release
+                }
+            }
+        }
+    }
+}

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-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

jitpack.yml

@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17

proguard-rules.pro

@@ -12,3 +12,10 @@
 
 ## OkHTTP
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
+
+-dontwarn org.simpleframework.xml.Element
+-dontwarn org.simpleframework.xml.ElementList
+-dontwarn org.simpleframework.xml.ElementListUnion
+-dontwarn org.simpleframework.xml.Namespace
+-dontwarn org.simpleframework.xml.Root
+-dontwarn org.simpleframework.xml.convert.Converter