Skip to content

Master v20.0 #35

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

Open
MattFoley wants to merge 22 commits into
base: master-v19.0
Choose a base branch
from
Open

Master v20.0 #35

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cb66521
Updating to point to Cobalt snapshot
erenn16 Mar 26, 2018
e09c296
Adding design library
erenn16 Mar 26, 2018
18ec461
moving it to the right spot this time
erenn16 Mar 26, 2018
e1e759b
Adding appcompat
erenn16 Mar 26, 2018
41d494d
More updates to get the build job working
erenn16 Mar 26, 2018
59e7512
Updating dependencies
erenn16 Mar 26, 2018
5a08ad1
More updates
Mar 26, 2018
875aa20
Add volley
Mar 26, 2018
88e272a
Explicitly specifying buildToolsVersion
erenn16 Mar 27, 2018
ddb4e4c
Manually adding in the kochava library to cave runner
erenn16 Mar 27, 2018
e4a97b7
Updating back to what it was
erenn16 Mar 28, 2018
a854f43
And putting some of them back
erenn16 Mar 28, 2018
25af2b1
And mopub is back in
erenn16 Mar 28, 2018
a8d9c2e
Bumping to 4.3.12
erenn16 Mar 29, 2018
e4d2d39
Removing mopub again since I don't think it was necessary
erenn16 Mar 29, 2018
080dfeb
Updating command for refresh-dependencies
erenn16 Mar 29, 2018
b972653
Build comment updated
erenn16 Mar 29, 2018
36e7669
updating version number
leoleblanc Apr 3, 2018
813ddab
Update build.gradle
Apr 5, 2018
f807e66
Bump version
Apr 6, 2018
799e9d8
Bump snapshot and version
Apr 6, 2018
6f41324
Bumping version
erenn16 Apr 9, 2018
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
15 changes: 1 addition & 14 deletions Android/3D Cave Runner - Android Studio/.idea/misc.xml
View file
Open in desktop

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

2,215 changes: 1,034 additions & 1,181 deletions Android/3D Cave Runner - Android Studio/.idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

310 changes: 163 additions & 147 deletions Android/3D Cave Runner - Android Studio/app/app.iml
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 17 additions & 9 deletions Android/3D Cave Runner - Android Studio/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def versionMajor = 4
def versionMinor = 3
def versionPatch = 11
def versionPatch = 12
def versionBuild = System.getenv('BUILD_NUMBER') ? Integer.parseInt(System.getenv('BUILD_NUMBER')) : 1

buildscript {
Expand All @@ -14,9 +14,9 @@ buildscript {
dependencies {
// The Fabric Gradle plugin uses an open ended version to react
// quickly to Android tooling updates
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.0'
classpath 'io.fabric.tools:gradle:1.22.0'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1'
classpath 'io.fabric.tools:gradle:1.22.1'
classpath 'com.google.gms:google-services:3.1.0'

}
}
Expand All @@ -35,8 +35,8 @@ android {
// make sure to update the .jks file pointing to your machine
}
}
compileSdkVersion 25
buildToolsVersion "25.0.3"
compileSdkVersion 26
buildToolsVersion '27.0.3'
Copy link

@armandgray armandgray Mar 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think these need to match, but according to greg you should be taking this line out anyways... not sure

defaultConfig {
applicationId "com.skillzgames.caverun"
minSdkVersion 19
Expand All @@ -48,6 +48,7 @@ android {
versionCode versionMajor * 10000000 + versionMinor * 100000 + versionPatch * 1000 + versionBuild
versionName "${versionMajor}.${versionMinor}.${versionPatch}.${versionBuild}"
}
flavorDimensions "currency"
buildTypes {
release {
debuggable=false
Expand All @@ -72,10 +73,12 @@ android {
productFlavors {
main {
resValue "string", "app_name", "3D Cave Runner"
dimension "currency"
}
vconly {
resValue "string", "app_name", "Cave Runner"
applicationIdSuffix ".vconly"
dimension "currency"
}
}
sourceSets {
Expand All @@ -94,16 +97,21 @@ android {
}
}


dependencies {
compile files('libs/unity-classes.jar')
//Skillz SDK

compile 'com.skillz.sdk:skillz-sdk-android:19.0.9-SNAPSHOT'
compile 'com.skillz.sdk:skillz-sdk-android:20.0.0-SNAPSHOT'
compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') {
transitive = true
}
compile 'com.google.android.gms:play-services-gcm:11.0.4'
compile 'com.google.android.gms:play-services-gcm:11.8.0'

compile 'com.android.support:design:26.1.0'
compile 'com.android.support:support-v4:26.1.0'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0'

}

repositories {
Expand Down
7 changes: 5 additions & 2 deletions Android/3D Cave Runner - Android Studio/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.google.gms:google-services:3.1.0'
}
}

allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}
4 changes: 2 additions & 2 deletions Android/3D Cave Runner - Android Studio/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Mon Mar 26 15:22:25 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6 changes: 3 additions & 3 deletions Android/3D Cave Runner - Android Studio/local.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Tue Oct 03 11:47:39 PDT 2017
ndk.dir=/Users/tjfallon/Library/Android/sdk/ndk-bundle
sdk.dir=/Users/tjfallon/Library/Android/sdk
#Mon Mar 26 15:59:21 PDT 2018
ndk.dir=/Users/gherlihy/Library/Android/sdk/ndk-bundle
sdk.dir=/Users/gherlihy/Library/Android/sdk
4 changes: 2 additions & 2 deletions bin/build-cave-runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ printf "apiSecret=bc1e89c576f18f877c98d2ca8a922096ef5415a8b5023e922eb6b2c474a455
sudo ln -sf /Users/opsadmin/Library/Android/sdk /usr/local/android-sdk-linux
# Compile Apps
# Clean dependencies so latest Skillz SDK is fetched
./gradlew --refresh-dependencies
#./gradlew --refresh-dependencies
Copy link

@armandgray armandgray Mar 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like teh comment above should be moved to where this is executed below and this commented line of code should be deleted


# Move theme for VC, and compile
mv "${WORKSPACE}/themes/custom_theme-cr-vc.json" "${WORKSPACE}/Android/3D Cave Runner - Android Studio/app/src/main/assets/custom_theme.json"
./gradlew clean :app:assembleVconlyRelease :app:crashlyticsUploadDistributionVconlyRelease
./gradlew --refresh-dependencies clean :app:assembleVconlyRelease :app:crashlyticsUploadDistributionVconlyRelease

# Move theme for Full, and compile
mv "${WORKSPACE}/themes/custom_theme-cr-full.json" "${WORKSPACE}/Android/3D Cave Runner - Android Studio/app/src/main/assets/custom_theme.json"
Expand Down