license changes

.gitignore

@@ -1,5 +1,6 @@
+# exclude
 .gradle/
-.idea/
+.idea/*
 out/
 build/
 *~
@@ -10,3 +11,6 @@ build/
 .project
 .settings
 local.properties
+
+# but include
+!.idea/copyright

feedly-andrss/LICENSE

@@ -0,0 +1,2 @@
+This program is licensed under GPLv3 (see gpl-3.0.txt)
+Some parts of it are double-licenced GPLv3 and Apache v2 (see LICENSE-2.0.txt)

LICENSE → feedly-andrss/LICENSE-2.0.txt

@@ -1,4 +1,5 @@
-Apache License
+
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,15 +179,15 @@ Apache License
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +200,3 @@ Apache License
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

feedly-andrss/build.gradle

@@ -1,18 +1,18 @@
 apply plugin: 'android'
 
 dependencies {
-    compile 'com.android.support:support-v4:18.0.0'
-    //feedly-api
     compile project(':feedly-api')
 
     //google dependencies
     compile "com.google.http-client:google-http-client-android:$versionGoogleClient"
+    //android dependencies
+    compile 'com.android.support:support-v4:18.0.0'
 }
 
 
 buildscript {
     repositories {
-        mavenCentral()
+mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.6.+'
@@ -23,13 +23,11 @@ idea.project { languageLevel = '1.7' }
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.0"
-
+    buildToolsVersion '19.0.0'
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 19
     }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -45,4 +43,5 @@ android {
             proguardFile 'proguard-rules.txt'
         }
     }
+    signingConfigs {}
 }