From 9f44e67f0aed29c9cc767333edc7a69e621e2750 Mon Sep 17 00:00:00 2001 From: syun Date: Tue, 2 Apr 2019 23:28:20 +0900 Subject: [PATCH 1/3] support latest AndroidStudio --- .idea/codeStyles/Project.xml | 29 ++++++++++++ .idea/encodings.xml | 6 --- .idea/misc.xml | 45 +++---------------- .idea/vcs.xml | 2 +- app/build.gradle | 4 +- .../webianks/bluechat/BluetoothChatService.kt | 6 ++- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 8 files changed, 45 insertions(+), 55 deletions(-) create mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/encodings.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index cc72de3..af0bbdd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,49 +1,14 @@ - - - + + + + - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index da24f70..bf4a146 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 @@ -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' diff --git a/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt b/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt index 783bf2d..a1087c5 100644 --- a/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt +++ b/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt @@ -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") + private val MY_UUID_INSECURE = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB") // Name for the SDP record when creating server socket diff --git a/build.gradle b/build.gradle index 0597a54..aa2b135 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 49214a4..2d8c1fa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 From 87a96136068d219f22aceba40599aaa999f81629 Mon Sep 17 00:00:00 2001 From: syun Date: Fri, 5 Apr 2019 22:15:53 +0900 Subject: [PATCH 2/3] add comment --- .../main/java/com/webianks/bluechat/BluetoothChatService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt b/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt index a1087c5..bd70dbe 100644 --- a/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt +++ b/app/src/main/java/com/webianks/bluechat/BluetoothChatService.kt @@ -34,8 +34,8 @@ class BluetoothChatService(context: Context, handler: Handler){ // 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("00001101-0000-1000-8000-00805F9B34FB") - private val MY_UUID_INSECURE = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB") + 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 From 1f36a95522e684d51937ad701aa2c7f6855da815 Mon Sep 17 00:00:00 2001 From: MOKYN Date: Fri, 5 Apr 2019 22:21:09 +0900 Subject: [PATCH 3/3] Update README.md support latest version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 376591e..9d2e612 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ Bluetooth chat app written purely in Kotlin. # Prerequisite
    -
  • Android Studio 3.0
    • +
  • Android Studio 3.3.2
  • Gradle Plugin v3.0.0-beta1
    • -
  • Kotlin Plugin v1.1.3-2
    • +
  • Kotlin Plugin v1.3.21
# Min SDK