cleanup code

bytepoets-ssi · bytepoets-ssi · commit 8a7b5feec54c · 2014-09-30T12:04:37.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -48,11 +48,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
     android.applicationVariants.all{ variant ->
         variant.mergeResources.doLast{
             ext.env = System.getenv()
@@ -64,10 +59,18 @@ android {
             valuesFile.write(content, 'UTF-8')
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    lintOptions {
+        lintConfig file("lint.xml")
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':publiss-android-core')
 }
 
diff --git a/app/lint.xml b/app/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <ignore regexp="okio-1.0.0.jar" />
+    </issue>
+</lint>
diff --git a/app/src/main/res/values/publiss_config.xml b/app/src/main/res/values/publiss_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Publiss App Configuration -->
     <string name="app_name" translatable="false">Publiss</string>
     <string name="app_secret" translatable="false">9fc4153103bd73cbe36c88738dc9e8bb</string>
-    <string name="app_token" translatable="false">1d3ae766-0206-4eb7-90e1-f2e2917a4635</string>
-</resources>
+    <string name="app_token" translatable="false" tools:ignore="TypographyDashes">1d3ae766-0206-4eb7-90e1-f2e2917a4635</string>
+</resources>

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,6 @@ android {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- compileOptions {`
`52`		`- sourceCompatibility JavaVersion.VERSION_1_7`
`53`		`- targetCompatibility JavaVersion.VERSION_1_7`
`54`		`- }`
`55`		`-`
`56`	`51`	`android.applicationVariants.all{ variant ->`
`57`	`52`	`variant.mergeResources.doLast{`
`58`	`53`	`ext.env = System.getenv()`
`@@ -64,10 +59,18 @@ android {`
`64`	`59`	`valuesFile.write(content, 'UTF-8')`
`65`	`60`	`}`
`66`	`61`	`}`
	`62`	`+`
	`63`	`+ compileOptions {`
	`64`	`+ sourceCompatibility JavaVersion.VERSION_1_7`
	`65`	`+ targetCompatibility JavaVersion.VERSION_1_7`
	`66`	`+ }`
	`67`	`+`
	`68`	`+ lintOptions {`
	`69`	`+ lintConfig file("lint.xml")`
	`70`	`+ }`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`dependencies {`
`70`		`- compile fileTree(dir: 'libs', include: ['*.jar'])`
`71`	`74`	`compile project(':publiss-android-core')`
`72`	`75`	`}`
`73`	`76`