Skip to content
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

Support latest Android Studio #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support latest Android Studio #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f44e67
support latest AndroidStudio
swmokyun Apr 2, 2019
87a9613
add comment
swmokyun Apr 5, 2019
1f36a95
Update README.md
swmokyun Apr 5, 2019
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
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions .idea/encodings.xml
View file
Open in desktop

This file was deleted.

45 changes: 5 additions & 40 deletions .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 changes: 1 addition & 1 deletion .idea/vcs.xml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Bluetooth chat app written purely in Kotlin.
# Prerequisite

<ul>
<li>Android Studio 3.0</li>
<li>Android Studio 3.3.2</li>
<li>Gradle Plugin v3.0.0-beta1</li>
<li>Kotlin Plugin v1.1.3-2</li>
<li>Kotlin Plugin v1.3.21</li>
</ul>

# Min SDK
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 26
buildToolsVersion "25.0.3"
buildToolsVersion "28.0.3"
defaultConfig {
applicationId "com.webianks.bluechat"
minSdkVersion 21
Expand All @@ -28,7 +28,7 @@ dependencies {
androidTestImplementation ('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:26.0.1'
testImplementation 'junit:junit:4.12'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ class BluetoothChatService(context: Context, handler: Handler){
private val TAG: String = javaClass.simpleName

// Unique UUID for this application
private val MY_UUID_SECURE = UUID.fromString("29621b37-e817-485a-a258-52da5261421a")
private val MY_UUID_INSECURE = UUID.fromString("d620cd2b-e0a4-435b-b02e-40324d57195b")
// private val MY_UUID_SECURE = UUID.fromString("29621b37-e817-485a-a258-52da5261421a")
// private val MY_UUID_INSECURE = UUID.fromString("d620cd2b-e0a4-435b-b02e-40324d57195b")
private val MY_UUID_SECURE = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB") // SerialPortServiceClass_UUID
private val MY_UUID_INSECURE = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB") // SerialPortServiceClass_UUID


// Name for the SDP record when creating server socket
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.1.3-2'
ext.kotlin_version = '1.3.21'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta5'
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Sep 11 23:34:33 IST 2017
#Tue Apr 02 22:13:45 JST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip