diff --git a/README.md b/README.md index 368b8fb..596d791 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Glide SVG ## Installation -Use [JitPack.io](https://jitpack.io/#qoqa/glide-svg/4.0.2) +Use [![](https://jitpack.io/v/projectdelta6/glide-svg.svg)](https://jitpack.io/#projectdelta6/glide-svg) + ``` repositories { @@ -12,13 +13,13 @@ repositories { ``` dependencies { ... - implementation 'com.github.qoqa:glide-svg:4.0.2' + implementation 'com.github.projectdelta6:glide-svg:4.15.1' } ``` ## Usage ```kotlin -GlideApp.with(this) +Glide.with(this) .load(url) .into(picto_view) ``` diff --git a/build.gradle b/build.gradle index 7ba9d56..dff8475 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,19 @@ buildscript { - ext.kotlin_version = '1.8.10' + ext.kotlin_version = '1.8.21' + ext.GlideVersion = "4.15.1" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } +plugins { + id 'org.jetbrains.kotlin.android' version '1.8.0' apply false + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' apply false +} allprojects { repositories { @@ -21,3 +26,8 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } + +wrapper { + gradleVersion = "8.1.0" + distributionType = Wrapper.DistributionType.ALL +} diff --git a/gradle.properties b/gradle.properties index 9e6fce1..f6720ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,10 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..da1db5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/library/build.gradle b/library/build.gradle index 02ed9e5..57ba25f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,36 +1,25 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'maven-publish' +apply plugin: 'com.google.devtools.ksp' + +//for JitPack +group = 'com.github.projectdelta6' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 14 - targetSdkVersion 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - namespace = "ch.qoqa.glide" -} - -publishing { - publications { - maven(MavenPublication) { - groupId 'com.github.qoqa' - artifactId 'glide-svg' - version '4.0.0' - - afterEvaluate { - from(components["release"]) - } - } - } + namespace = "com.duck.glide_svg" } dependencies { - api 'com.github.bumptech.glide:glide:4.14.2' - api 'com.github.bumptech.glide:annotations:4.14.2' - kapt 'com.github.bumptech.glide:compiler:4.14.2' + api "com.github.bumptech.glide:glide:$GlideVersion" + api "com.github.bumptech.glide:annotations:$GlideVersion" + ksp "com.github.bumptech.glide:compiler:$GlideVersion" api 'com.caverock:androidsvg-aar:1.4' implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" diff --git a/sample/build.gradle b/sample/build.gradle index 7b18036..8523ec2 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' +apply plugin: 'com.google.devtools.ksp' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { applicationId "ch.qoqa.sample" minSdkVersion 14 - targetSdkVersion 33 + targetSdk 34 versionCode 1 versionName "1.0" @@ -32,8 +32,8 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation (project(':library')) + implementation "com.github.bumptech.glide:glide:$GlideVersion" + ksp "com.github.bumptech.glide:compiler:$GlideVersion" - implementation 'com.github.bumptech.glide:glide:4.14.2' - kapt 'com.github.bumptech.glide:compiler:4.14.2' + implementation (project(':library')) }