Skip to content
This repository was archived by the owner on Dec 3, 2020. It is now read-only.
Merged
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
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ android:
components:
- platform-tools
- tools
- build-tools-25.0.3
- android-25
- build-tools-26.0.2
- android-26
- add-on
- extra-android-m2repository
- extra-google-m2repository

before_script:
- wget http://services.gradle.org/distributions/gradle-2.14.1-bin.zip
Expand All @@ -26,7 +27,7 @@ script:
git tag v$VERSION;
git push --quiet https://$GITHUBKEY@github.com/opentok/accelerator-textchat-android v$VERSION;
else
./gradlew build;
./gradlew assembleRelease;
fi

notifications:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ buildscript {
allprojects {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
maven { url 'http://tokbox.bintray.com/maven' }

}
}

Expand Down
23 changes: 9 additions & 14 deletions textchat-acc-pack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,22 @@ apply plugin: 'com.android.library'
apply plugin: 'maven'

android {
def acceleratorVersion = '1.0.3'
compileSdkVersion 25
buildToolsVersion "25.0.3"
def acceleratorVersion = '1.0.4'
compileSdkVersion 26
buildToolsVersion "26.0.2"

defaultConfig {
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 26
versionCode 2
versionName "1.0.3"
versionName "1.0.4"
project.archivesBaseName = "opentok-accelerator-textchat"
project.version = acceleratorVersion
}
buildTypes {
release {
minifyEnabled false
buildConfigField "String", "acceleratorVersion", '\"'+acceleratorVersion+'\"'
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
minifyEnabled false
buildConfigField "String", "acceleratorVersion", '\"'+acceleratorVersion+'\"'
buildConfigField 'String', 'acceleratorVersion', '\"'+acceleratorVersion+'\"'
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand Down Expand Up @@ -116,8 +111,8 @@ def getRevisionAndTime() {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.opentok.android:opentok-accelerator-core:1.0.+'
}