Merge pull request #331 from magnusja/develop

core release 0.9.x

Author: magnusja

.github/workflows/android.yml

@@ -9,13 +9,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: set up JDK 1.8
+    - name: set up JDK 1.11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 1.11
     - name: install libusb
-      run: wget https://github.com/libusb/libusb/archive/v1.0.23.zip && unzip v1.0.23.zip
+      run: wget https://github.com/libusb/libusb/archive/v1.0.24.zip && unzip v1.0.24.zip
     - name: write local properties
-      run: echo "libusb.dir=$GITHUB_WORKSPACE/libusb-1.0.23" > $GITHUB_WORKSPACE/local.properties
-    - name: Build with Gradle
-      run: ./gradlew build
+      run: echo "libusb.dir=$GITHUB_WORKSPACE/libusb-1.0.24" > $GITHUB_WORKSPACE/local.properties
+    - name: Build & test with Gradle
+      run: ./gradlew jacocoTestReport --stacktrace
+    - name: codecov
+      run: bash <(curl -s https://codecov.io/bash)

.travis.yml

@@ -1,7 +1,7 @@
 libaums
 =======
-[![Javadocs](https://www.javadoc.io/badge/me.jahnen/libaums.svg)](https://www.javadoc.io/doc/me.jahnen/libaums)
-[ ![Build Status](https://travis-ci.org/magnusja/libaums.svg?branch=develop)](https://travis-ci.org/magnusja/libaums)[ ![codecov](https://codecov.io/gh/magnusja/libaums/branch/develop/graph/badge.svg)](https://codecov.io/gh/magnusja/libaums)[ ![Codacy Badge](https://api.codacy.com/project/badge/Grade/31124a2747de41b49c040b9f7979c2a6)](https://www.codacy.com/manual/magnusja/libaums?utm_source=github.com&utm_medium=referral&utm_content=magnusja/libaums&utm_campaign=Badge_Grade)[ ![Download](https://api.bintray.com/packages/magnusja/maven/libaums/images/download.svg) ](https://bintray.com/magnusja/maven/libaums/_latestVersion)
+[![Javadocs](https://www.javadoc.io/badge/me.jahnen.libaums/core.svg)](https://www.javadoc.io/doc/me.jahnen.libaums/core)
+[ ![Build Status](https://travis-ci.org/magnusja/libaums.svg?branch=develop)](https://travis-ci.org/magnusja/libaums)[ ![codecov](https://codecov.io/gh/magnusja/libaums/branch/develop/graph/badge.svg)](https://codecov.io/gh/magnusja/libaums)[ ![Codacy Badge](https://api.codacy.com/project/badge/Grade/31124a2747de41b49c040b9f7979c2a6)](https://www.codacy.com/manual/magnusja/libaums?utm_source=github.com&utm_medium=referral&utm_content=magnusja/libaums&utm_campaign=Badge_Grade)
 [ ![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/libaums)
 
 A library to access USB mass storage devices (pen drives, external HDDs, card readers) using the Android USB Host API. Currently it supports the SCSI command set and the FAT32 file system.
@@ -13,14 +13,14 @@ A library to access USB mass storage devices (pen drives, external HDDs, card re
 The library can be included into your project like this:
 
 ```ruby
-implementation 'me.jahnen:libaums:0.7.6'
+implementation 'me.jahnen.libaums:core:0.9.1'
 ```
 
 If you need the HTTP or the storage provider module:
 
 ```ruby
-implementation 'me.jahnen:libaums-httpserver:0.5.3'
-implementation 'me.jahnen:libaums-storageprovider:0.5.1'
+implementation 'me.jahnen.libaums:httpserver:0.6.2'
+implementation 'me.jahnen.libaums:storageprovider:0.6.2'
 ```
 
 ### Basics
@@ -175,7 +175,7 @@ Usually third party apps do not have access to the files on a mass storage devic
 
 
 ### HTTP server
-[![Javadocs](https://www.javadoc.io/badge/com.github.mjdev/libaums-httpserver.svg)](https://www.javadoc.io/doc/com.github.mjdev/libaums-httpserver)
+[![Javadocs](https://www.javadoc.io/badge/me.jahnen.libaums/httpserver.svg)](https://www.javadoc.io/doc/me.jahnen.libaums/httpserver)
 
 libaums currently supports two different HTTP server libraries.
 
@@ -294,16 +294,16 @@ See the example app for additional details on that.
 
 
 ### Storage Access Framework
-[![Javadocs](https://www.javadoc.io/badge/com.github.mjdev/libaums-storageprovider.svg)](https://www.javadoc.io/doc/com.github.mjdev/libaums-storageprovider)
+[![Javadocs](https://www.javadoc.io/badge/me.jahnen.libaums/storageprovider.svg)](https://www.javadoc.io/doc/me.jahnen.libaums/storageprovider)
 
 To learn more about this visit: https://developer.android.com/guide/topics/providers/document-provider.html
 
 To integrate this module in your app the only thing you have to do is add the definition in your AndroidManifest.xml.
 
 ```xml
 <provider
-    android:name="com.github.mjdev.libaums.storageprovider.UsbDocumentProvider"
-    android:authorities="com.github.mjdev.libaums.storageprovider.documents"
+    android:name="me.jahnen.libaums.storageprovider.UsbDocumentProvider"
+    android:authorities="me.jahnen.libaums.storageprovider.documents"
     android:exported="true"
     android:grantUriPermissions="true"
     android:permission="android.permission.MANAGE_DOCUMENTS"
@@ -326,7 +326,7 @@ After that apps using the Storage Access Framework will be able to access the fi
 
 ##### Thesis
 
-The library was developed by Mr. Jahnen as part of his bachelor's thesis in 2014. It's a sub-topic of the research topic "Secure Copy Protection for Mobile Apps" by Mr. Kannengießer. The full thesis document can be downloaded [here](https://www.os.in.tum.de/fileadmin/w00bdp/www/Lehre/Abschlussarbeiten/Jahnen-thesis.pdf).
+The library was developed by Mr. Jahnen as part of his bachelor's thesis in 2014. It's a sub-topic of the research topic "Secure Copy Protection for Mobile Apps" by Mr. Kannengießer. The full thesis document can be downloaded [here](https://www.in.tum.de/fileadmin/w00bws/os/Lehre/Abschlussarbeiten/Jahnen-thesis.pdf).
 
 
 Libaums - Library to access USB Mass Storage Devices  

README.md

@@ -1,16 +1,14 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.1"
+    compileSdkVersion 32
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
+        testInstrumentationRunnerArguments
         minSdkVersion 15
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 32
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments.package = 'me.jahnen.libaums.androidtests'
@@ -36,13 +34,13 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.1'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
 
-    androidTestImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test:core:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation project(':javafs')
     androidTestImplementation project(':libusbcommunication')
 }

androidtests/build.gradle

@@ -1,4 +1,4 @@
-package me.jahnen.libaums.androidtests
+package me.jahnen.libaums.core.androidtests
 
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
@@ -9,13 +9,13 @@ import android.hardware.usb.UsbManager
 import android.util.Log
 import androidx.test.InstrumentationRegistry
 import androidx.test.filters.LargeTest
-import com.github.magnusja.libaums.javafs.JavaFsFileSystemCreator
-import com.github.mjdev.libaums.UsbMassStorageDevice
-import com.github.mjdev.libaums.UsbMassStorageDevice.Companion.getMassStorageDevices
-import com.github.mjdev.libaums.fs.FileSystem
-import com.github.mjdev.libaums.fs.FileSystemFactory
-import com.github.mjdev.libaums.fs.UsbFile
-import com.github.mjdev.libaums.usb.UsbCommunicationFactory
+import me.jahnen.libaums.javafs.JavaFsFileSystemCreator
+import me.jahnen.libaums.core.UsbMassStorageDevice
+import me.jahnen.libaums.core.UsbMassStorageDevice.Companion.getMassStorageDevices
+import me.jahnen.libaums.core.fs.FileSystem
+import me.jahnen.libaums.core.fs.FileSystemFactory
+import me.jahnen.libaums.core.fs.UsbFile
+import me.jahnen.libaums.core.usb.UsbCommunicationFactory
 import junit.framework.Assert
 import junit.framework.TestCase
 import me.jahnen.libaums.libusbcommunication.LibusbCommunicationCreator
@@ -43,7 +43,7 @@ open class LibAumsTest(
     /**
      * Action string to request the permission to communicate with an UsbDevice.
      */
-    private val ACTION_USB_PERMISSION = "com.github.mjdev.libaums.USB_PERMISSION"
+    private val ACTION_USB_PERMISSION = "me.jahnen.libaums.USB_PERMISSION"
 
     private lateinit var device: UsbMassStorageDevice
     private lateinit var fs: FileSystem

androidtests/src/androidTest/java/me/jahnen/libaums/androidtests/LibAumsTest.kt androidtests/src/androidTest/java/me/jahnen/libaums/core/androidtests/LibAumsTest.kt

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.jahnen.libaums.androidtests">
+    package="me.jahnen.libaums.core.androidtests">
 </manifest>

androidtests/src/main/AndroidManifest.xml

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 32
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "com.github.mjdev.usbfileman"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
     }
@@ -25,9 +26,9 @@ android {
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'junit:junit:4.12'
-    api 'androidx.appcompat:appcompat:1.0.0-beta01'
-    api 'com.google.android.material:material:1.0.0-beta01'
+    implementation 'junit:junit:4.13'
+    api 'androidx.appcompat:appcompat:1.4.0'
+    api 'com.google.android.material:material:1.6.0-alpha01'
     api project(':libaums')
     api project(':httpserver')
     api project(':storageprovider')

app/build.gradle

@@ -18,7 +18,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.github.mjdev.libaums.usbfileman" >
+    package="me.jahnen.libaums.core.usbfileman" >
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -31,9 +31,10 @@
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity
-            android:name="com.github.mjdev.libaums.usbfileman.MainActivity"
+            android:name="me.jahnen.libaums.core.usbfileman.MainActivity"
             android:label="@string/app_name"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
                 <action android:name="android.intent.action.MAIN" />
@@ -47,8 +48,8 @@
         </activity>
 
         <provider
-            android:name="com.github.mjdev.libaums.storageprovider.UsbDocumentProvider"
-            android:authorities="com.github.mjdev.libaums.storageprovider.documents"
+            android:name="me.jahnen.libaums.storageprovider.UsbDocumentProvider"
+            android:authorities="me.jahnen.libaums.storageprovider.documents"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS"