Skip to content

Commit

Permalink
Migrating From Eclispe to Android Studio
Browse files Browse the repository at this point in the history
  • Loading branch information
markwinter committed Feb 25, 2014
1 parent d543dac commit 9958fc0
Show file tree
Hide file tree
Showing 122 changed files with 3,787 additions and 13 deletions.
25 changes: 12 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@
*.class

# generated files
bin/
gen/
/bin/
/gen/

# Local configuration file (sdk path, etc)
local.properties
build.properties

# Eclipse project files
.classpath
.project

# Proguard folder generated by Eclipse
proguard/

# Intellij project files
/GrocerySync-Android/build/
/GrocerySync-Android/src/main/res/.DS_Store
/.gradle/
/.idea/
/.DS_Store
/GrocerySync-Android/.DS_Store
/GrocerySync-Android/GrocerySync-Android-GrocerySync-Android.iml
/.idea/misc.xml
/GrocerySync-Android.iml
*.iml
*.ipr
*.iws
.idea/
23 changes: 23 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apply plugin: 'android'

android {
compileSdkVersion 19
buildToolsVersion "19.0.1"

defaultConfig {
minSdkVersion 10
targetSdkVersion 19
}

buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
}

dependencies {
compile 'com.android.support:support-v4:+'
compile files('libs/jToxcore-0.5.1.jar')
}
Binary file added app/build/incremental/aidl/debug/dependency.store
Binary file not shown.
11 changes: 11 additions & 0 deletions app/build/incremental/mergeAssets/debug/merger.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<merger>

<dataSet config="main" >
<source path="/home/soft/workspace-studio/app/src/main/assets" />
</dataSet>
<dataSet config="debug" >
<source path="/home/soft/workspace-studio/app/src/debug/assets" />
</dataSet>

</merger>
Loading

0 comments on commit 9958fc0

Please sign in to comment.