diff --git a/.gitignore b/.gitignore index f417061..7096ce5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,9 @@ *.iml .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries -/.idea/markdown* +/.idea .DS_Store /build /captures .externalNativeBuild *.apk - diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7ac24c7..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 7158618..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.8 - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 72bf01a..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 13e3021..1292c78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "26.0.0" + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "org.frap129.spectrum" minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 7 versionName "2.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { debug { @@ -18,19 +17,17 @@ android { } release { minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('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' - testCompile 'junit:junit:4.12' - compile 'com.android.support:cardview-v7:25.3.1' - compile 'eu.chainfire:libsuperuser:1.0.0.+' - compile 'com.android.support:design:25.3.1' + def supportLibVersion = '27.0.2' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation "com.android.support:appcompat-v7:${supportLibVersion}" + implementation "com.android.support:design:${supportLibVersion}" + implementation "com.android.support:cardview-v7:${supportLibVersion}" + implementation "eu.chainfire:libsuperuser:1.0.0.201704021214" } diff --git a/app/src/androidTest/java/org/frap129/spectrum/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/frap129/spectrum/ExampleInstrumentedTest.java deleted file mode 100644 index 213a889..0000000 --- a/app/src/androidTest/java/org/frap129/spectrum/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.frap129.spectrum; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.assertEquals; - -/** - * Instrumentation test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("org.frap129.spectrum", appContext.getPackageName()); - } -} diff --git a/app/src/test/java/org/frap129/spectrum/ExampleUnitTest.java b/app/src/test/java/org/frap129/spectrum/ExampleUnitTest.java deleted file mode 100644 index 367531d..0000000 --- a/app/src/test/java/org/frap129/spectrum/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.frap129.spectrum; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index c2eea8e..92a8017 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.2.0-alpha04' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2f5298a..346de47 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jul 17 19:55:42 IST 2017 +#Sat Feb 24 20:47:57 SGT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip