Fix project structure

pavel-golub · Jun 19, 2015 · 516dc30 · 516dc30
1 parent 8304d27
commit 516dc30
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
+/local.properties
 
 # Eclipse project files
 .classpath
@@ -25,5 +26,7 @@ local.properties
 gradle/
 gradlew
 gradlew.bat
+.gradle/
+.idea/
 
 .DS_Store
diff --git a/library/build.gradle b/library/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:1.0.0"
+        classpath "com.android.tools.build:gradle:1.2.3"
     }
 }
 
@@ -14,8 +14,8 @@ repositories {
 }
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion "20"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     sourceSets {
         main { // Use old Ant-build directory layout

diff --git a/library/proguard-project.txt → library/proguard-rules.txt b/library/proguard-project.txt → library/proguard-rules.txt
diff --git a/library/project.properties b/library/project.properties
diff --git a/library/AndroidManifest.xml → library/src/main/AndroidManifest.xml b/library/AndroidManifest.xml → library/src/main/AndroidManifest.xml
@@ -5,6 +5,6 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="21" />
 
 </manifest>
diff --git a/...ary/src/com/kskkbys/rate/RateThisApp.java → ...ain/res/com/kskkbys/rate/RateThisApp.java b/...ary/src/com/kskkbys/rate/RateThisApp.java → ...ain/res/com/kskkbys/rate/RateThisApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Keisuke Kobayashi
+ * Copyright 2013-2015 Keisuke Kobayashi
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/library/res/values-cs/strings.xml → library/src/main/res/values-cs/strings.xml b/library/res/values-cs/strings.xml → library/src/main/res/values-cs/strings.xml
diff --git a/library/res/values-de/strings.xml → library/src/main/res/values-de/strings.xml b/library/res/values-de/strings.xml → library/src/main/res/values-de/strings.xml
diff --git a/library/res/values-es/strings.xml → library/src/main/res/values-es/strings.xml b/library/res/values-es/strings.xml → library/src/main/res/values-es/strings.xml
diff --git a/library/res/values-fr/strings.xml → library/src/main/res/values-fr/strings.xml b/library/res/values-fr/strings.xml → library/src/main/res/values-fr/strings.xml
diff --git a/library/res/values-hr/strings.xml → library/src/main/res/values-hr/strings.xml b/library/res/values-hr/strings.xml → library/src/main/res/values-hr/strings.xml
diff --git a/library/res/values-ja/strings.xml → library/src/main/res/values-ja/strings.xml b/library/res/values-ja/strings.xml → library/src/main/res/values-ja/strings.xml
diff --git a/library/res/values-ko/strings.xml → library/src/main/res/values-ko/strings.xml b/library/res/values-ko/strings.xml → library/src/main/res/values-ko/strings.xml
diff --git a/library/res/values-pl/strings.xml → library/src/main/res/values-pl/strings.xml b/library/res/values-pl/strings.xml → library/src/main/res/values-pl/strings.xml
diff --git a/library/res/values-ru/strings.xml → library/src/main/res/values-ru/strings.xml b/library/res/values-ru/strings.xml → library/src/main/res/values-ru/strings.xml
diff --git a/library/res/values-sv/strings.xml → library/src/main/res/values-sv/strings.xml b/library/res/values-sv/strings.xml → library/src/main/res/values-sv/strings.xml
diff --git a/library/res/values-tr/strings.xml → library/src/main/res/values-tr/strings.xml b/library/res/values-tr/strings.xml → library/src/main/res/values-tr/strings.xml
diff --git a/library/res/values-uk/strings.xml → library/src/main/res/values-uk/strings.xml b/library/res/values-uk/strings.xml → library/src/main/res/values-uk/strings.xml
diff --git a/library/res/values-zh/strings.xml → library/src/main/res/values-zh/strings.xml b/library/res/values-zh/strings.xml → library/src/main/res/values-zh/strings.xml
diff --git a/library/res/values/strings.xml → library/src/main/res/values/strings.xml b/library/res/values/strings.xml → library/src/main/res/values/strings.xml
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -0,0 +1,32 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:1.2.3"
+    }
+}
+
+apply plugin: "com.android.application"
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 22
+    }
+    buildTypes {
+      release {
+        minifyEnabled false
+        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+      }
+    }
+}
+
+dependencies {
+    compile project(':library')
+    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.android.support:appcompat-v7:22.1.1'
+}
diff --git a/sample/proguard-project.txt → sample/proguard-rules.txt b/sample/proguard-project.txt → sample/proguard-rules.txt
diff --git a/sample/project.properties b/sample/project.properties
diff --git a/sample/AndroidManifest.xml → sample/src/main/AndroidManifest.xml b/sample/AndroidManifest.xml → sample/src/main/AndroidManifest.xml
diff --git a/sample/ic_launcher-web.png → sample/src/main/ic_launcher-web.png b/sample/ic_launcher-web.png → sample/src/main/ic_launcher-web.png
diff --git a/...c/com/kskkbys/rtasample/MainActivity.java → ...a/com/kskkbys/rtasample/MainActivity.java b/...c/com/kskkbys/rtasample/MainActivity.java → ...a/com/kskkbys/rtasample/MainActivity.java
diff --git a/sample/libs/android-support-v4.jar → sample/src/main/libs/android-support-v4.jar b/sample/libs/android-support-v4.jar → sample/src/main/libs/android-support-v4.jar
diff --git a/sample/res/drawable-hdpi/ic_launcher.png → ...rc/main/res/drawable-hdpi/ic_launcher.png b/sample/res/drawable-hdpi/ic_launcher.png → ...rc/main/res/drawable-hdpi/ic_launcher.png
diff --git a/sample/res/drawable-mdpi/ic_launcher.png → ...rc/main/res/drawable-mdpi/ic_launcher.png b/sample/res/drawable-mdpi/ic_launcher.png → ...rc/main/res/drawable-mdpi/ic_launcher.png
diff --git a/sample/res/drawable-xhdpi/ic_launcher.png → ...c/main/res/drawable-xhdpi/ic_launcher.png b/sample/res/drawable-xhdpi/ic_launcher.png → ...c/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/sample/res/drawable-xxhdpi/ic_launcher.png → .../main/res/drawable-xxhdpi/ic_launcher.png b/sample/res/drawable-xxhdpi/ic_launcher.png → .../main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/sample/res/layout/activity_main.xml → sample/src/main/res/layout/activity_main.xml b/sample/res/layout/activity_main.xml → sample/src/main/res/layout/activity_main.xml
diff --git a/sample/res/menu/main.xml → sample/src/main/res/menu/main.xml b/sample/res/menu/main.xml → sample/src/main/res/menu/main.xml
diff --git a/sample/res/values-sw600dp/dimens.xml → ...le/src/main/res/values-sw600dp/dimens.xml b/sample/res/values-sw600dp/dimens.xml → ...le/src/main/res/values-sw600dp/dimens.xml
diff --git a/sample/res/values-sw720dp-land/dimens.xml → ...c/main/res/values-sw720dp-land/dimens.xml b/sample/res/values-sw720dp-land/dimens.xml → ...c/main/res/values-sw720dp-land/dimens.xml
diff --git a/sample/res/values-v11/styles.xml → sample/src/main/res/values-v11/styles.xml b/sample/res/values-v11/styles.xml → sample/src/main/res/values-v11/styles.xml
diff --git a/sample/res/values-v14/styles.xml → sample/src/main/res/values-v14/styles.xml b/sample/res/values-v14/styles.xml → sample/src/main/res/values-v14/styles.xml
diff --git a/sample/res/values/dimens.xml → sample/src/main/res/values/dimens.xml b/sample/res/values/dimens.xml → sample/src/main/res/values/dimens.xml
diff --git a/sample/res/values/strings.xml → sample/src/main/res/values/strings.xml b/sample/res/values/strings.xml → sample/src/main/res/values/strings.xml
diff --git a/sample/res/values/styles.xml → sample/src/main/res/values/styles.xml b/sample/res/values/styles.xml → sample/src/main/res/values/styles.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':library'
+include ':library', ':sample'