From 52d9cd728f994556a960d077f7442345a56f5def Mon Sep 17 00:00:00 2001 From: Hoan Date: Tue, 1 Apr 2025 09:43:16 +0700 Subject: [PATCH 1/2] updaste --- .travis.yml | 50 ++++++++++++------------ app/build.gradle | 25 ++++++++---- app/src/main/AndroidManifest.xml | 3 +- build.gradle | 6 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- klinechart/build.gradle | 6 ++- 6 files changed, 53 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index d865cd1..49ec591 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,25 @@ -language: android -jdk: oraclejdk8 -branches: - only: - - master -before_script: - # Download desired version of Gradle - - wget http://services.gradle.org/distributions/gradle-6.7.1-bin.zip - - unzip -qq gradle-6.7.1-bin.zip - - export GRADLE_HOME=$PWD/gradle-6.7.1 - - export PATH=$GRADLE_HOME/bin:$PATH - # just to test gradle version, against our provided one - - gradle -v - - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a -c 512M - - emulator -avd test -no-audio -no-window & - - android-wait-for-emulator - - adb shell input keyevent 82 & -android: - components: - - platform-tools - - tools - - build-tools-30.0.2 - - android-30 - - android-19 - - sys-img-armeabi-v7a-android-19 \ No newline at end of file +#language: android +#jdk: oraclejdk8 +#branches: +# only: +# - master +#before_script: +# # Download desired version of Gradle +# - wget http://services.gradle.org/distributions/gradle-6.7.1-bin.zip +# - unzip -qq gradle-6.7.1-bin.zip +# - export GRADLE_HOME=$PWD/gradle-6.7.1 +# - export PATH=$GRADLE_HOME/bin:$PATH +# # just to test gradle version, against our provided one +# - gradle -v +# - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a -c 512M +# - emulator -avd test -no-audio -no-window & +# - android-wait-for-emulator +# - adb shell input keyevent 82 & +#android: +# components: +# - platform-tools +# - tools +# - build-tools-33.0.1 +# - android-33 +# - android-19 +# - sys-img-armeabi-v7a-android-19 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d2c5400..e3a5629 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,17 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-kapt' + id 'kotlin-parcelize' +} android { - compileSdkVersion 30 + compileSdkVersion 33 buildToolsVersion "30.0.2" defaultConfig { applicationId "com.liihuu.kline" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 33 versionCode version_code versionName "$version_name" vectorDrawables.useSupportLibrary = true @@ -22,7 +23,17 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + + debug { + minifyEnabled false + shrinkResources false + } + + } + buildFeatures { + viewBinding = true } + namespace 'com.cryptopie.bitcastle' } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 18d5fe7..0eb3717 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + Date: Tue, 1 Apr 2025 10:04:11 +0700 Subject: [PATCH 2/2] migrate to new sdk --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e3a5629..7dda544 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.application' id 'kotlin-android' id 'kotlin-kapt' - id 'kotlin-parcelize' + id 'kotlin-android-extensions' } android { @@ -33,7 +33,7 @@ android { buildFeatures { viewBinding = true } - namespace 'com.cryptopie.bitcastle' + namespace 'com.liihuu.kline' } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0eb3717..2c5c979 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + + android:label="@string/app_name" + android:exported="true" + tools:ignore="MissingClass">