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..7dda544 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-android-extensions' +} 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.liihuu.kline' } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 18d5fe7..2c5c979 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + android:label="@string/app_name" + android:exported="true" + tools:ignore="MissingClass"> diff --git a/build.gradle b/build.gradle index 507a9af..78636e2 100644 --- a/build.gradle +++ b/build.gradle @@ -2,16 +2,16 @@ buildscript { ext.version_code = 13 ext.version_name = "2.2.3" - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.6.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:8.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.github.panpf.bintray-publish:bintray-publish:1.0.0' +// classpath 'com.github.panpf.bintray-publish:bintray-publish:1.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index afabedc..2606a18 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip diff --git a/klinechart/build.gradle b/klinechart/build.gradle index 6976894..e6bd86f 100644 --- a/klinechart/build.gradle +++ b/klinechart/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply from: 'publish.gradle' android { compileSdkVersion 30 @@ -19,12 +18,17 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + minifyEnabled false + shrinkResources false + } } androidExtensions { experimental = true } + namespace 'com.liihuu.klinechart' } dependencies {