mirror of
https://github.com/InsanusMokrassar/krontab.git
synced 2025-12-05 12:35:47 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 211b57cdf6 | |||
| 6b4bc42f3d | |||
| c406f883d2 | |||
| 93b56c0861 | |||
| 801c27c7f8 |
5
.github/workflows/kdocs.yml
vendored
5
.github/workflows/kdocs.yml
vendored
@@ -10,7 +10,10 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 11
|
||||
- name: Fix android 32.0.0 dx
|
||||
continue-on-error: true
|
||||
run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && cp d8 dx && cd lib && cp d8.jar dx.jar
|
||||
- name: Build
|
||||
run: ./gradlew dokkaHtml
|
||||
- name: Publish KDocs
|
||||
|
||||
2
.github/workflows/publishing_packages.yml
vendored
2
.github/workflows/publishing_packages.yml
vendored
@@ -7,7 +7,7 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 17
|
||||
java-version: 11
|
||||
- name: Update version
|
||||
run: |
|
||||
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||
|
||||
19
CHANGELOG.md
19
CHANGELOG.md
@@ -1,24 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## 2.2.4
|
||||
|
||||
* `Versions`
|
||||
* `Kotlin`: `1.9.21`
|
||||
* `Serialization`: `1.6.1`
|
||||
|
||||
## 2.2.3
|
||||
|
||||
**THIS UPDATE CONTAINS UPGRADE OF USED JDK UP TO 17**
|
||||
|
||||
* Versions
|
||||
* `Kotlin`: `1.9.20`
|
||||
|
||||
## 2.2.2
|
||||
|
||||
* Versions
|
||||
* `Kotlin`: `1.9.20-RC`
|
||||
* `Android` (min/target): `34`
|
||||
|
||||
## 2.2.1
|
||||
|
||||
* Potential fix of [#65](https://github.com/InsanusMokrassar/krontab/issues/65)
|
||||
|
||||
11
build.gradle
11
build.gradle
@@ -61,7 +61,6 @@ kotlin {
|
||||
}
|
||||
linuxX64()
|
||||
mingwX64()
|
||||
linuxArm64()
|
||||
|
||||
|
||||
sourceSets {
|
||||
@@ -110,7 +109,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
|
||||
|
||||
android {
|
||||
compileSdk "$android_compileSdkVersion".toInteger()
|
||||
buildToolsVersion = "$android_buildToolsVersion"
|
||||
buildToolsVersion "$android_buildToolsVersion"
|
||||
namespace "${group}.${project.name}"
|
||||
|
||||
defaultConfig {
|
||||
@@ -129,8 +128,8 @@ android {
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
@@ -142,6 +141,6 @@ android {
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
@@ -9,11 +9,11 @@ android.useAndroidX=true
|
||||
android.enableJetifier=false
|
||||
|
||||
|
||||
kotlin_version=1.9.21
|
||||
kotlin_version=1.9.20-Beta
|
||||
kotlin_coroutines_version=1.7.3
|
||||
kotlin_serialization_version=1.6.1
|
||||
kotlin_serialization_version=1.6.0
|
||||
|
||||
dokka_version=1.9.10
|
||||
dokka_version=1.9.0
|
||||
|
||||
klockVersion=4.0.10
|
||||
|
||||
@@ -23,10 +23,10 @@ github_release_plugin_version=2.4.1
|
||||
|
||||
## Android
|
||||
|
||||
android_gradle_version=8.1.2
|
||||
android_gradle_version=7.4.2
|
||||
android_minSdkVersion=21
|
||||
android_compileSdkVersion=34
|
||||
android_buildToolsVersion=34.0.0
|
||||
android_compileSdkVersion=33
|
||||
android_buildToolsVersion=33.0.2
|
||||
dexcount_version=4.0.0
|
||||
junit_version=4.12
|
||||
test_ext_junit_version=1.1.3
|
||||
@@ -36,5 +36,5 @@ androidx_work_version=2.8.1
|
||||
|
||||
## Common
|
||||
|
||||
version=2.2.4
|
||||
android_code_version=34
|
||||
version=2.2.1
|
||||
android_code_version=31
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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-8.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
apply plugin: 'maven-publish'
|
||||
|
||||
task javadocsJar(type: Jar) {
|
||||
archiveClassifier = 'javadoc'
|
||||
classifier = 'javadoc'
|
||||
}
|
||||
|
||||
publishing {
|
||||
@@ -96,10 +96,4 @@ if (project.hasProperty("signing.gnupg.keyName")) {
|
||||
dependsOn(it)
|
||||
}
|
||||
}
|
||||
|
||||
// Workaround to make android sign operations depend on signing tasks
|
||||
project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
|
||||
def signingTasks = project.getTasks().withType(Sign.class)
|
||||
mustRunAfter(signingTasks)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user