Skip to content

Commit

Permalink
Update to Android Studio 2.2, Play Services 9.6, Support Library 24.2…
Browse files Browse the repository at this point in the history
….1 and update the README
  • Loading branch information
c99koder committed Sep 22, 2016
1 parent 21ef38d commit 171d13c
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 101 deletions.
7 changes: 1 addition & 6 deletions .idea/gradle.xml

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

22 changes: 11 additions & 11 deletions README.md
Expand Up @@ -21,29 +21,29 @@ Screenshots

Requirements
------
* Android Studio 0.2.x
* Android 4.3 SDK
* Android Support Library, revision 18 or newer
* Android Studio 2.2.x
* Gradle 2.2.x
* Android 7.0 SDK
* Android Support Library, revision 24 or newer
* Google Play Services, version 9.6.0 or newer
* android-websockets library: https://github.com/irccloud/android-websockets
* An Android device running Android 2.2 or newer

Building
------
* Make sure you've installed the Android 4.3 SDK and upgraded to the latest version of Android Studio
* Make sure you've installed the Android 7.0 SDK and upgraded to the latest version of Android Studio
* Make sure you've updated all support repository and Google Play Services repository packages in the Android SDK manager
* Check out android-websockets and the IRCCloud Android project from github
* Mac/Linux: Launch Android Studio and open the irccloud android folder as a project
* Windows: Import the build.gradle files from both the android and android-websocket projects into a new project
* Android Studio will warn you that "android-websockets" is unrecognized, you can ignore this warning
* Android Studio will notify you that the Android framework has been detected, click on the "Configure" button and then click OK
* Click Build > Make Project, or Run > Run 'android' to automatically deploy the apk to your device
* Open Android studio and select the IRCCloud Android build.gradle file
* Click Run button for the 'irccloud-android' configuration to automatically deploy the apk to your device

The app can also be built using Gradle from the command-line using the build.gradle file located in the IRCCloud Android project.
The app can also be built using Gradle from the command-line using the build.gradle file located in the IRCCloud Android project by typing "./gradlew :assembleDebug"

_You must uninstall the Play Store version of the app first before installing a debug version, as the signing keys will not match._

License
------
Copyright (C) 2013 IRCCloud, Ltd.
Copyright (C) 2016 IRCCloud, Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Expand Down
26 changes: 13 additions & 13 deletions build.gradle
Expand Up @@ -20,7 +20,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'io.fabric.tools:gradle:1.21.2'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
Expand Down Expand Up @@ -322,19 +322,19 @@ tasks.whenTaskAdded { task ->
}

dependencies {
compile 'com.android.support:support-v4:24.2.0'
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:cardview-v7:24.2.0'
compile 'com.android.support:design:24.2.0'
compile 'com.android.support:recyclerview-v7:24.2.0'
compile 'com.android.support:customtabs:24.2.0'
compile 'com.android.support:support-v4:24.2.1'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
compile 'com.android.support:customtabs:24.2.1'

compile 'com.google.android.gms:play-services-base:9.4.0'
compile 'com.google.android.gms:play-services-auth:9.4.0'
compile 'com.google.android.gms:play-services-identity:9.4.0'
compile 'com.google.android.gms:play-services-ads:9.4.0'
compile 'com.google.android.gms:play-services-gcm:9.4.0'
compile 'com.google.android.gms:play-services-wearable:9.4.0'
compile 'com.google.android.gms:play-services-base:9.6.0'
compile 'com.google.android.gms:play-services-auth:9.6.0'
compile 'com.google.android.gms:play-services-identity:9.6.0'
compile 'com.google.android.gms:play-services-ads:9.6.0'
compile 'com.google.android.gms:play-services-gcm:9.6.0'
compile 'com.google.android.gms:play-services-wearable:9.6.0'
compile 'com.google.android.apps.dashclock:dashclock-api:+'
compile 'com.vandalsoftware.android:dslv:+'
compile 'com.infstory:switch-preference-compat:1.0.+'
Expand Down

0 comments on commit 171d13c

Please sign in to comment.