diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000..cbb0d32
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..3f8f710
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..99202cc
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..dd150ec
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4fc9751..6d05fdc 100755
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,14 @@
buildscript {
repositories {
jcenter()
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.1'
+ classpath 'com.android.tools.build:gradle:3.1.4'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -21,6 +26,10 @@ allprojects {
}
maven { url 'https://maven.fabric.io/public' }
*/
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
}
}
diff --git a/build/generated/mockable-android-25.jar b/build/generated/mockable-android-25.jar
deleted file mode 100755
index ef54480..0000000
Binary files a/build/generated/mockable-android-25.jar and /dev/null differ
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
deleted file mode 100755
index 3096a38..0000000
--- a/build/intermediates/dex-cache/cache.xml
+++ /dev/null
@@ -1,464 +0,0 @@
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..5706f29 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sun Sep 30 18:30:49 IST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/local.properties b/local.properties
index f74a3d8..020cc45 100755
--- a/local.properties
+++ b/local.properties
@@ -1,12 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Tue May 29 10:16:45 IST 2018
-ndk.dir=C\:\\Users\\user\\AppData\\Local\\Android\\Sdk\\ndk-bundle
-sdk.dir=C\:\\Users\\user\\AppData\\Local\\Android\\Sdk
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Sun Sep 30 17:28:36 IST 2018
+sdk.dir=/home/harsh/Android/Sdk
diff --git a/soundcom-app/build.gradle b/soundcom-app/build.gradle
index ee2d198..f654845 100755
--- a/soundcom-app/build.gradle
+++ b/soundcom-app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
- buildToolsVersion "25.0.1"
+ buildToolsVersion '27.0.3'
defaultConfig {
applicationId "soundcom.scorelab.org.soundcom"
minSdkVersion 17
@@ -27,15 +27,16 @@ configurations.all {
resolutionStrategy.force 'com.android.support:support-annotations:23.1.0'
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- compile project(':soundcom-lib')
- testCompile 'junit:junit:4.12'
- testCompile 'com.android.support.test:runner:0.5'
- testCompile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.espresso:espresso-core:2.2.2'
+ implementation 'com.android.support:appcompat-v7:25.4.0'
+ implementation 'com.android.support:design:25.4.0'
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ implementation project(':soundcom-lib')
+ testImplementation 'junit:junit:4.12'
+ testImplementation 'com.android.support.test:runner:0.5'
+ testImplementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.espresso:espresso-core:2.2.2'
}
\ No newline at end of file
diff --git a/soundcom-app/soundcom-app.iml b/soundcom-app/soundcom-app.iml
index 3073a3d..19e536b 100755
--- a/soundcom-app/soundcom-app.iml
+++ b/soundcom-app/soundcom-app.iml
@@ -9,7 +9,6 @@
-
@@ -23,31 +22,31 @@
-
+
+
-
+
-
+
-
@@ -55,15 +54,20 @@
-
+
+
+
+
+
+
+
-
@@ -71,7 +75,6 @@
-
@@ -79,44 +82,31 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
+
-
+
+
+
@@ -124,39 +114,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/soundcom-lib/build.gradle b/soundcom-lib/build.gradle
index 0c669a0..06be392 100755
--- a/soundcom-lib/build.gradle
+++ b/soundcom-lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 25
- buildToolsVersion "25.0.1"
+ buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 17
@@ -22,16 +22,16 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.android.support:design:25.4.0'
- compile 'com.github.wendykierp:JTransforms:3.0'
- compile 'org.apache.commons:commons-math3:3.4.1'
+ implementation 'com.android.support:appcompat-v7:25.4.0'
+ implementation 'com.android.support:design:25.4.0'
+ implementation 'com.github.wendykierp:JTransforms:3.0'
+ implementation 'org.apache.commons:commons-math3:3.4.1'
// compile 'com.google.firebase:firebase-auth:11.0.4'
- testCompile 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.12'
}
diff --git a/soundcom-lib/soundcom-lib.iml b/soundcom-lib/soundcom-lib.iml
index d1efae6..40e1cb0 100755
--- a/soundcom-lib/soundcom-lib.iml
+++ b/soundcom-lib/soundcom-lib.iml
@@ -9,7 +9,6 @@
-
@@ -20,43 +19,49 @@
-
+
-
+
+
-
+
-
+
-
+
+
+
+
+
+
+
-
@@ -64,7 +69,6 @@
-
@@ -72,7 +76,6 @@
-
@@ -80,78 +83,58 @@
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file