Skip to content

Commit

Permalink
travis update
Browse files Browse the repository at this point in the history
  • Loading branch information
adrian09h committed Jul 16, 2019
1 parent a9b3e26 commit 5b5ef74
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 90 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*.iml

.gradle
/local.properties
/.idea/caches
Expand Down
10 changes: 3 additions & 7 deletions .idea/gradle.xml

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

11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: android
android:
components:
- tools
- build-tools-28.0.0
- build-tools-28.0.3
- android-28
- platform-tools
- extra-android-support
Expand All @@ -15,9 +15,8 @@ android:
sudo: required
jdk:
- oraclejdk8
before_install:
- chmod +x gradlew
- chmod +rx app
install:
- true

before_script:
- chmod +x gradlew
script:
- ./gradlew build
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {
applicationId "io.getstream.chat.sdk"
minSdkVersion 21
targetSdkVersion 28
versionCode 3
versionCode 2
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down
Binary file modified app/release/app-release.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion app/release/output.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppThemeNoActionBar">
<activity android:name=".ChannelsActivity"></activity>
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
14 changes: 0 additions & 14 deletions app/src/main/java/io/getstream/chat/sdk/AppInfo.java

This file was deleted.

7 changes: 0 additions & 7 deletions app/src/main/java/io/getstream/chat/sdk/AppSecretKey.java

This file was deleted.

32 changes: 0 additions & 32 deletions app/src/main/java/io/getstream/chat/sdk/ChannelsActivity.java

This file was deleted.

1 change: 0 additions & 1 deletion app/src/main/java/io/getstream/chat/sdk/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.getstream.sdk.chat.model.channel.Channel;
import com.getstream.sdk.chat.model.enums.Token;
import com.getstream.sdk.chat.rest.core.StreamChat;
import com.getstream.sdk.chat.utils.Global;
import com.getstream.sdk.chat.view.activity.ChatActivity;
import com.getstream.sdk.chat.view.fragment.ChannelListFragment;

Expand Down
17 changes: 0 additions & 17 deletions app/src/main/res/layout/activity_channels.xml

This file was deleted.

2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ allprojects {
}
}



task clean(type: Delete) {
delete rootProject.buildDir
}
4 changes: 3 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,14 @@ if [ -n "$JAVA_HOME" ] ; then
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
Expand Down Expand Up @@ -167,4 +169,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
exec "$JAVACMD" "$@"
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include ':app', ':library'

include ':library'
//, ':app'

0 comments on commit 5b5ef74

Please sign in to comment.