Merge branch 'fix-gradle' into ddroid

depau-forks · Aug 13, 2018 · a57ae27 · a57ae27
2 parents 29a23c2 + aaf8c2f
commit a57ae27
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 48 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.github.mjdev.usbfileman"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -24,12 +24,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile project(':libaums')
-    compile project(':httpserver')
-    compile project(':storageprovider')
-    compile project(':javafs')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'junit:junit:4.12'
+    api 'com.android.support:appcompat-v7:28.0.0-rc01'
+    api 'com.android.support:design:28.0.0-rc01'
+    api project(':libaums')
+    api project(':httpserver')
+    api project(':storageprovider')
+    api project(':javafs')
 }
diff --git a/build.gradle b/build.gradle
@@ -6,14 +6,20 @@ buildscript {
         maven {
             url 'https://dl.bintray.com/magnusja/maven'
         }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         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'
 
+        classpath 'org.codehaus.groovy:groovy-all:2.4.12'
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -47,6 +53,10 @@ allprojects {
     repositories {
         jcenter()
         maven { url 'https://dl.bintray.com/magnusja/maven' }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 26 22:12:57 PDT 2017
+#Mon Aug 13 19:03:14 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/httpserver/build.gradle b/httpserver/build.gradle
@@ -13,12 +13,12 @@ configurations {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -34,14 +34,14 @@ android {
 }
 
 dependencies {
-    compile 'org.nanohttpd:nanohttpd:2.+'
+    api 'org.nanohttpd:nanohttpd:2.+'
     javadocDeps 'org.nanohttpd:nanohttpd:2.+'
 
-    compile 'com.koushikdutta.async:androidasync:2.+'
+    api 'com.koushikdutta.async:androidasync:2.+'
 
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:support-annotations:25.1.0'
-    compile project(':libaums')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api 'com.android.support:support-annotations:27.1.1'
+    api project(':libaums')
 }
 
 task bintray {

diff --git a/javafs/build.gradle b/javafs/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -25,15 +25,15 @@ android {
 }
 
 dependencies {
-    compile project(':libaums')
+    api project(':libaums')
 
-    compile('log4j:log4j:1.2.17')
-    compile('de.mindpipe.android:android-logging-log4j:1.0.3')
-    compile 'com.github.magnusja:java-fs:0.1.3'
+    api('log4j:log4j:1.2.17')
+    api('de.mindpipe.android:android-logging-log4j:1.0.3')
+    api 'com.github.magnusja:java-fs:0.1.3'
 
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/libaums/build.gradle b/libaums/build.gradle
@@ -13,12 +13,12 @@ configurations {
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -50,14 +50,14 @@ android {
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.apache.commons:commons-io:1.3.2'
-    testCompile 'com.eclipsesource.minimal-json:minimal-json:0.9.4'
-    testCompile 'org.xenei:junit-contracts:0.1.7'
-    testCompile 'org.mockito:mockito-core:2.7.22'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.apache.commons:commons-io:1.3.2'
+    testImplementation 'com.eclipsesource.minimal-json:minimal-json:0.9.4'
+    testImplementation 'org.xenei:junit-contracts:0.1.7'
+    testImplementation 'org.mockito:mockito-core:2.7.22'
 
-    compile 'com.android.support:support-annotations:25.3.1'
-    javadocDeps 'com.android.support:support-annotations:25.3.1'
+    api 'com.android.support:support-annotations:27.1.1'
+    javadocDeps 'com.android.support:support-annotations:27.1.1'
 }
 
 task bintray {

diff --git a/storageprovider/build.gradle b/storageprovider/build.gradle
@@ -13,12 +13,12 @@ configurations {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -34,9 +34,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'org.apache.commons:commons-io:1.3.2'
-    compile project(':libaums')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api 'org.apache.commons:commons-io:1.3.2'
+    api project(':libaums')
 }