Skip to content

Rob sounds #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jleithart merged 3 commits into from
Mar 4, 2014
Merged

Rob sounds #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01beba0
Added some cheer and booing sounds for scoring.
robertkleffner Feb 11, 2014
b0a5040
Update gitignore but build file already committed
robertkleffner Feb 26, 2014
793d88e
Entire build folder not being .gitignored
robertkleffner Feb 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ local.properties

# Android Studio
.idea/
.gradle
.gradle/
*.gradle
/*/local.properties
/*/out
/*/*/build
/*/build
/*/*/production
*.iml
*.iws
Expand Down
14 changes: 7 additions & 7 deletions KickShot/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.6.+'
classpath 'com.android.tools.build:gradle:0.8.+'
}
}

Expand All @@ -21,12 +21,12 @@ repositories {
}

android {
compileSdkVersion 18
buildToolsVersion "18.0.1"
compileSdkVersion 19
buildToolsVersion "19.0.1"

defaultConfig {
minSdkVersion 8
targetSdkVersion 18
targetSdkVersion 19
}
}

Expand All @@ -40,7 +40,7 @@ sourceSets {

dependencies {
compile 'org.roboguice:roboguice:2.0'
compile 'com.android.support:appcompat-v7:18.0.0'
compile 'com.android.support:appcompat-v7:19.0.0'
testLocalCompile 'junit:junit:4.8.2'

testLocalCompile 'org.robolectric:robolectric:2.1'
Expand All @@ -51,14 +51,14 @@ dependencies {

task localTest(type: Test, dependsOn: assemble) {
testClassesDir = sourceSets.testLocal.output.classesDir

/*
android.sourceSets.main.java.srcDirs.each { dir ->
def buildDir = dir.getAbsolutePath().split('/')
buildDir = (buildDir[0..(buildDir.length - 4)] + ['build', 'classes', 'debug']).join('/')

sourceSets.testLocal.compileClasspath += files(buildDir)
sourceSets.testLocal.runtimeClasspath += files(buildDir)
}
}*/

classpath = sourceSets.testLocal.runtimeClasspath
}
Expand Down
20 changes: 20 additions & 0 deletions KickShot/build/exploded-bundles/ComAndroidSupportAppcompatV71900.aar/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
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.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.appcompat">
<uses-sdk android:minSdkVersion="7"/>
<application />
</manifest>
Loading