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
19 changes: 8 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@

sudo: false
language: android
jdk: oraclejdk7
jdk: oraclejdk8

android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
# - platform-tools
# - tools

# The BuildTools version used by your project
- build-tools-19.1.0
- build-tools-23.0.1

# The SDK version used to compile your project
- android-19
- android-23

# Additional components
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-19
- addon-google_apis-google-23

# Specify at least one system image,
# if you need to run emulator(s) during your tests
# - sys-img-armeabi-v7a-android-19

script:
- echo "Assembling..."
- echo "It's morphin' time!"
- chmod +x ./gradlew
- ./gradlew :soup:clean :soup:test
- ./gradlew check --daemon --info
16 changes: 12 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.12.2'
classpath 'org.robolectric:robolectric-gradle-plugin:0.12.0'
classpath 'com.android.tools.build:gradle:1.3.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
}
}

allprojects {
repositories {
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}

// File: build.gradle
println """\
Welcome to Gradle $gradle.gradleVersion - http://www.gradle.org
Expand Down
2 changes: 1 addition & 1 deletion foursquare-android-oauth
Submodule foursquare-android-oauth updated 52 files
+7 −5 .gitignore
+15 −6 README.md
+11 −12 build.gradle
+107 −34 foursquare-oauth-library/build.gradle
+0 −1 foursquare-oauth-library/install.md
+0 −62 foursquare-oauth-library/pom.xml
+0 −20 foursquare-oauth-library/proguard-project.txt
+0 −15 foursquare-oauth-library/project.properties
+5 −5 foursquare-oauth-library/src/main/AndroidManifest.xml
+41 −41 foursquare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/FoursquareCancelException.java
+41 −41 foursquare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/FoursquareDenyException.java
+40 −40 ...square-oauth-library/src/main/java/com/foursquare/android/nativeoauth/FoursquareInternalErrorException.java
+41 −41 ...quare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/FoursquareInvalidRequestException.java
+270 −269 foursquare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/FoursquareOAuth.java
+46 −46 foursquare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/FoursquareOAuthException.java
+42 −42 ...e-oauth-library/src/main/java/com/foursquare/android/nativeoauth/FoursquareUnsupportedVersionException.java
+237 −236 foursquare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/TokenExchangeActivity.java
+48 −48 foursquare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/model/AccessTokenResponse.java
+43 −43 foursquare-oauth-library/src/main/java/com/foursquare/android/nativeoauth/model/AuthCodeResponse.java
+34 −34 foursquare-oauth-library/src/main/res/layout/loading.xml
+0 −20 foursquare-oauth-library/src/main/res/values-es/strings.xml
+0 −20 foursquare-oauth-library/src/main/res/values-fr/strings.xml
+19 −19 foursquare-oauth-library/src/main/res/values/strings.xml
+14 −21 foursquare-oauth-sample/build.gradle
+ foursquare-oauth-sample/libs/android-support-v4.jar
+3 −0 foursquare-oauth-sample/lint.xml
+0 −48 foursquare-oauth-sample/pom.xml
+0 −20 foursquare-oauth-sample/proguard-project.txt
+0 −15 foursquare-oauth-sample/project.properties
+10 −10 foursquare-oauth-sample/src/main/AndroidManifest.xml
+0 −0 foursquare-oauth-sample/src/main/java/com/foursquare/android/sample/ExampleTokenStore.java
+2 −2 foursquare-oauth-sample/src/main/java/com/foursquare/android/sample/MainActivity.java
+ foursquare-oauth-sample/src/main/res/drawable-hdpi/connect_to_foursquare_blue_default.9.png
+ foursquare-oauth-sample/src/main/res/drawable-hdpi/connect_to_foursquare_blue_pressed.9.png
+ foursquare-oauth-sample/src/main/res/drawable-hdpi/ic_launcher.png
+ foursquare-oauth-sample/src/main/res/drawable-mdpi/connect_to_foursquare_blue_default.9.png
+ foursquare-oauth-sample/src/main/res/drawable-mdpi/connect_to_foursquare_blue_pressed.9.png
+ foursquare-oauth-sample/src/main/res/drawable-mdpi/ic_launcher.png
+ foursquare-oauth-sample/src/main/res/drawable-xhdpi/connect_to_foursquare_blue_default.9.png
+ foursquare-oauth-sample/src/main/res/drawable-xhdpi/connect_to_foursquare_blue_pressed.9.png
+ foursquare-oauth-sample/src/main/res/drawable-xhdpi/ic_launcher.png
+0 −0 foursquare-oauth-sample/src/main/res/drawable/connect_to_foursquare_blue.xml
+0 −0 foursquare-oauth-sample/src/main/res/layout/activity_main.xml
+0 −0 foursquare-oauth-sample/src/main/res/values/strings.xml
+3 −18 gradle.properties
+2 −2 gradle/wrapper/gradle-wrapper.properties
+0 −0 gradlew
+90 −90 gradlew.bat
+0 −11 local.properties
+0 −121 maven_push.gradle
+0 −146 pom.xml
+1 −3 settings.gradle
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

DEBUG_STORE_FILE=../../../../../.android/debug.keystore
RELEASE_STORE_FILE=../../../../../dropbox/dev/project resources/my-release-key.keystore
DEBUG_STORE_FILE=~/.android/debug.keystore
RELEASE_STORE_FILE=~/release.keystore
RELEASE_KEY_ALIAS=soup
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jul 06 22:41:28 MST 2014
#Tue Nov 10 11:29:15 MST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
54 changes: 7 additions & 47 deletions soup-pro/build.gradle
Original file line number Diff line number Diff line change
@@ -1,70 +1,30 @@
gradle.taskGraph.whenReady { taskGraph ->
if(taskGraph.hasTask(':app:assembleRelease')) {
// Only execute when we are trying to assemble a release build
def pass = System.console() != null ? System.console().readPassword("\nPlease enter store passphrase: ") : ""
// readPassword returns a char[] so we need to wrap it into a string, because that's
// most likely what you need
pass = new String(pass)
// Use the pass variable here (so set signing configs here)
android.signingConfigs.release.storePassword = pass

def pass2 = System.console() != null ? System.console().readPassword("\nPlease enter key passphrase: ") : ""
// readPassword returns a char[] so we need to wrap it into a string, because that's
// most likely what you need
pass2 = new String(pass2)
android.signingConfigs.release.keyPassword = pass2
}
}

apply plugin: 'com.android.application'

android {
compileSdkVersion 19
buildToolsVersion '20'
compileSdkVersion 23
buildToolsVersion '23.0.1'

defaultConfig {
minSdkVersion 9
targetSdkVersion 19
minSdkVersion 14
targetSdkVersion 23
versionCode 3
versionName "1.2"
}

signingConfigs {
debugSigning {
storeFile file(DEBUG_STORE_FILE)
storePassword "android"
keyAlias "androiddebugkey"
keyPassword "android"
}

releaseSigning {
storeFile file(RELEASE_STORE_FILE)
storePassword ""
keyAlias RELEASE_KEY_ALIAS
keyPassword ""
}
}

buildTypes {
debug {
zipAlign true
debuggable true
runProguard false
minifyEnabled false
applicationIdSuffix ".debug"
versionNameSuffix "-debug"
signingConfig signingConfigs.debugSigning
}

release {
zipAlign true
debuggable false
runProguard false
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
signingConfig signingConfigs.releaseSigning
}
}
}

dependencies {
compile 'com.android.support:support-v4:19.+'
compile 'com.android.support:support-v4:23.1.0'
}
86 changes: 0 additions & 86 deletions soup-pro/soup-pro.iml

This file was deleted.

Loading