Skip to content

Commit

Permalink
Update versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
guolindev committed Aug 22, 2021
1 parent d19332a commit 8ad8322
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 104 deletions.
4 changes: 2 additions & 2 deletions build.gradle
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.4.21'
ext.kotlin_version = '1.5.21'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:7.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
68 changes: 0 additions & 68 deletions core/bintray.gradle

This file was deleted.

37 changes: 6 additions & 31 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
minSdkVersion 15
targetSdkVersion 30
versionCode 1
versionName "1.0"
targetSdkVersion 31
archivesBaseName = "core"
}
buildTypes {
Expand All @@ -20,36 +18,13 @@ android {
lintOptions {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}

apply plugin: 'com.github.panpf.bintray-publish'

allprojects {
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
options.addStringOption('encoding', 'UTF-8')
}
}

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.github.panpf.bintray-publish:bintray-publish:1.0.0'
}
}

publish {
userOrg = 'sinyu890807'
groupId = 'org.litepal.guolindev'
artifactId = 'core'
publishVersion = '3.2.3'
desc = 'An Android library that allows developers to use SQLite database extremely easy'
website = 'https://github.com/LitePalFramework/LitePal'
}
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.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
8 changes: 6 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
applicationId "org.litepal.litepalsample"
minSdkVersion 15
targetSdkVersion 30
targetSdkVersion 31
versionCode 1
versionName "1.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand All @@ -21,6 +21,10 @@ android {
lintOptions {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
Expand Down

0 comments on commit 8ad8322

Please sign in to comment.