Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 25 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
#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
25 changes: 18 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.liihuu.kline">
<manifest xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="false"
Expand All @@ -10,7 +10,9 @@
android:theme="@style/AppTheme.NoActionBar">
<activity
android:name=".MainActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true"
tools:ignore="MissingClass">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 5 additions & 1 deletion klinechart/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {
Expand Down