Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
.idea
*.iml
.gradle
build/
libraries/opencv/build

/local.properties
/.idea/workspace.xml
/.idea/libraries
Expand Down
101 changes: 0 additions & 101 deletions app/app.iml

This file was deleted.

14 changes: 8 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.1.2'
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'io.fabric.tools:gradle:1.+'
}
}
Expand All @@ -19,13 +19,13 @@ repositories {


android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 23
buildToolsVersion "22.0.1"

defaultConfig {
applicationId "com.pgodzin.tictactoe"
minSdkVersion 15
targetSdkVersion 21
targetSdkVersion 23
versionCode 2
versionName "1.1"
}
Expand All @@ -40,8 +40,10 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.0.0'
compile 'com.afollestad:material-dialogs:0.6.4.5'
compile 'com.android.support:appcompat-v7:23.1.0'
compile('com.afollestad.material-dialogs:core:0.8.4.2@aar') {
transitive = true
}
compile project(':libraries:opencv')
compile('com.crashlytics.sdk.android:crashlytics:2.3.2@aar') {
transitive = true;
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
maven { url 'https://dl.bintray.com/drummer-aidan/maven' }
}
dependencies {
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'com.android.tools.build:gradle:1.2.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -16,5 +16,6 @@ allprojects {
repositories {
jcenter()
maven { url 'https://dl.bintray.com/drummer-aidan/maven' }
maven { url "https://jitpack.io" }
}
}
164 changes: 164 additions & 0 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading