From 16175d278db5994f324bdc1760a987f7b89543d2 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 13 Aug 2018 22:02:21 +0200 Subject: [PATCH] Include patched custom libaums as a submodule --- .gitmodules | 3 +++ app/build.gradle | 3 ++- build.gradle | 30 ++++++++++++++++++++++++++++++ libaums | 1 + settings.gradle | 3 ++- 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 libaums diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f72f0ab --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libaums"] + path = libaums + url = https://github.com/Depau/libaums.git diff --git a/app/build.gradle b/app/build.gradle index 8af2f7e..de019fd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,8 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support:design:28.0.0-rc01' implementation 'com.android.support:recyclerview-v7:28.0.0-rc01' - implementation 'com.github.mjdev:libaums:0.5.5' +// implementation 'com.github.mjdev:libaums:0.5.5' + implementation project(':libaums') testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/build.gradle b/build.gradle index adf4e04..e78917f 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,11 @@ buildscript { classpath 'com.android.tools.build:gradle:3.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // For libaums + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -25,3 +30,28 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } + + +ext { + bintrayRepo = 'maven' + + publishedGroupId = 'com.github.mjdev' + libraryName = 'libaums' + + // artifact comes from module as well as libraryVersion + //artifact = 'libaums' + + libraryDescription = 'Android USB mass storage library with FAT32 support.' + + siteUrl = 'https://github.com/mjdev/libaums' + gitUrl = 'https://github.com/mjdev/libaums.git' + + + developerId = 'mjdev' + developerName = 'mjahnen' + developerEmail = 'jahnen@in.tum.de' + + licenseName = 'The Apache Software License, Version 2.0' + licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + allLicenses = ["Apache-2.0"] +} \ No newline at end of file diff --git a/libaums b/libaums new file mode 160000 index 0000000..a57ae27 --- /dev/null +++ b/libaums @@ -0,0 +1 @@ +Subproject commit a57ae278535946db69e2e1ea7f02171d002198a5 diff --git a/settings.gradle b/settings.gradle index e7b4def..2547323 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ -include ':app' +include ':app', ':libaums' +project(':libaums').projectDir = new File('libaums/libaums') \ No newline at end of file