Skip to content

Commit

Permalink
bump kotlin, gradle, java, compile sdk, libs
Browse files Browse the repository at this point in the history
  • Loading branch information
vadiole committed Jan 21, 2024
1 parent c2026d1 commit 0e0dae5
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 23 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
buildscript {
ext.verName = "1.0.3"
ext.verName = "1.0.4"

repositories {
google()
gradlePluginPortal()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

Expand All @@ -20,6 +20,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
15 changes: 8 additions & 7 deletions colorpicker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ plugins {
}

android {
compileSdkVersion 33
namespace 'vadiole.colorpicker'

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
compileSdk 34
targetSdkVersion 34
}

buildTypes {
Expand All @@ -23,10 +24,10 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
kotlinOptions {
jvmTarget = '11'
jvmTarget = '17'
}
}

Expand All @@ -38,13 +39,13 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
}

ext {
PUBLISH_GROUP_ID = 'io.github.vadiole'
PUBLISH_ARTIFACT_ID = 'colorpicker'
PUBLISH_VERSION = '1.0.3'
PUBLISH_VERSION = '1.0.4'
}

apply from: "${rootProject.projectDir}/scripts/publish-mavencentral.gradle"
2 changes: 1 addition & 1 deletion colorpicker/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="vadiole.colorpicker" />
<manifest />
16 changes: 8 additions & 8 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ plugins {
}

android {
compileSdkVersion 33

namespace 'vadiole.colorpickerdemo'
defaultConfig {
applicationId "vadiole.colorpickerdemo"
minSdkVersion 21
targetSdkVersion 33
compileSdk 34
targetSdkVersion 34
versionCode 1
versionName "1.0.3"
versionName "1.0.4"
}

buildTypes {
Expand All @@ -26,17 +26,17 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

dependencies {
implementation project(':colorpicker')

implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}
3 changes: 1 addition & 2 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="vadiole.colorpickerdemo">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.nonTransitiveRClass=false
android.nonFinalResIds=false
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-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

0 comments on commit 0e0dae5

Please sign in to comment.