Skip to content

Commit

Permalink
Project Structure Update
Browse files Browse the repository at this point in the history
*Improve project structure to compile correctly.
  • Loading branch information
rayliverified committed Aug 7, 2017
1 parent 0745a9e commit 45d5d68
Show file tree
Hide file tree
Showing 49 changed files with 178 additions and 372 deletions.
40 changes: 40 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Built application files
build/*
*/app.iml

# Crashlytics configuations
com_crashlytics_export_strings.xml

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

# Gradle generated files
.gradle/

# Signing files
.signing/

# User-specific configurations
.idea/*
.idea/libraries/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/vcs.xml
*.iml
captures/*

# OS-specific files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
8 changes: 0 additions & 8 deletions SlimChart/.gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
.externalNativeBuild
22 changes: 0 additions & 22 deletions SlimChart/.idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions SlimChart/.idea/copyright/profiles_settings.xml

This file was deleted.

19 changes: 0 additions & 19 deletions SlimChart/.idea/gradle.xml

This file was deleted.

62 changes: 0 additions & 62 deletions SlimChart/.idea/misc.xml

This file was deleted.

10 changes: 0 additions & 10 deletions SlimChart/.idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions SlimChart/.idea/runConfigurations.xml

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions SlimChart/app/src/test/java/com/mancj/example/ExampleUnitTest.java

This file was deleted.

33 changes: 17 additions & 16 deletions SlimChart/build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
apply plugin: 'com.android.library'

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
android {
compileSdkVersion 25
buildToolsVersion "25.0.3"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
defaultConfig {
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "0.1.0"
}
}

allprojects {
repositories {
jcenter()
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

task clean(type: Delete) {
delete rootProject.buildDir
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.1'
}
File renamed without changes.
1 change: 0 additions & 1 deletion SlimChart/slimchart/.gitignore

This file was deleted.

31 changes: 0 additions & 31 deletions SlimChart/slimchart/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 6 additions & 10 deletions SlimChart/app/build.gradle → app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.3"
compileSdkVersion 25
buildToolsVersion "25.0.3"
defaultConfig {
applicationId "com.mancj.example"
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 25
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -21,11 +20,8 @@ android {

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:24.2.1'
compile 'com.android.support:design:24.2.1'
testCompile 'junit:junit:4.12'
compile project(path: ':slimchart')

compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
}
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 45d5d68

Please sign in to comment.