Skip to content
This repository has been archived by the owner on Jun 7, 2020. It is now read-only.

Commit

Permalink
Merge pull request #36 from RocketChat/fix_circleci_build_error_20160911
Browse files Browse the repository at this point in the history
Fix circleci build error 20160911
  • Loading branch information
Yusuke Iwaki committed Sep 11, 2016
2 parents 6715bdb + 26d42f3 commit bb34a5c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 18 deletions.
13 changes: 5 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ def getKeyStore() {
}

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion 24
buildToolsVersion "24.0.0"

Properties properties = new Properties()
properties.load(project.rootProject.file('app/fabric.properties').newDataInputStream())
Expand All @@ -27,14 +27,12 @@ android {
defaultConfig {
applicationId "chat.rocket.android"
minSdkVersion 16
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "0.0.0"
manifestPlaceholders = [fabric_api_key:properties.getProperty("apiKey", System.getenv("FABRIC_API_KEY"))]
ext.betaDistributionNotifications=false
ext.betaDistributionReleaseNotes=getCurrentCommitMessage()

// buildConfigField "String", "REPRO_APP_TOKEN", localprop.getProperty("REPRO_APP_TOKEN", System.getenv("REPRO_APP_TOKEN"))
}
signingConfigs {
release {
Expand All @@ -60,8 +58,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.1.1'
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:design:24.2.0'

compile 'com.github.clans:fab:1.6.2'

Expand All @@ -80,6 +78,5 @@ dependencies {
transitive = true
}

compile 'io.repro:repro-android-sdk:0.12.0'
compile 'org.nibor.autolink:autolink:0.5.0'
}
5 changes: 0 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<meta-data
android:name="io.fabric.ApiKey"
android:value="${fabric_api_key}" />

<service android:name="io.repro.android.ReproService" />
<activity
android:name="io.repro.android.surveys.SurveyActivity"
android:theme="@style/io_repro_android_SurveyActivityTheme"/>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import chat.rocket.android.api.OkHttpHelper;
import io.fabric.sdk.android.Fabric;
import io.repro.android.Repro;

public class RocketChatApplication extends Application {
@Override
Expand All @@ -28,6 +27,5 @@ public void onCreate() {

CrashlyticsCore core = new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build();
Fabric.with(this, new Crashlytics.Builder().core(core).build());
Repro.setup(BuildConfig.REPRO_APP_TOKEN);
}
}
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ allprojects {
repositories {
jcenter()
maven { url 'https://maven.fabric.io/public' }
maven { url 'http://cdn.repro.io/android' }
maven { url 'https://github.com/RocketChat/Android-DDP/raw/master/repository' } // for Android-DDP
}
}
Expand Down
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 @@
#Wed Oct 21 11:34:03 PDT 2015
#Sun Sep 11 16:04:15 JST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 comments on commit bb34a5c

Please sign in to comment.