diff --git a/build.gradle b/build.gradle index f950184..3ff16b9 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0' - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0' + classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.20' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3' } } @@ -18,9 +18,12 @@ allprojects { google() mavenCentral() } - plugins.withId("com.vanniktech.maven.publish") { - mavenPublish { - sonatypeHost = "S01" + + configurations.all { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'org.jetbrains.kotlin') { + details.useVersion "1.8.10" + } } } } diff --git a/demo/build.gradle b/demo/build.gradle index 061b6ad..2913554 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -3,12 +3,13 @@ plugins { } android { - compileSdk 30 + namespace "io.github.muddz.styleabletoast.demo" + compileSdk 34 defaultConfig { applicationId "io.github.muddz.styleabletoast.demo" - minSdk 16 - targetSdk 30 + minSdk 21 + targetSdk 34 versionCode 1 versionName "1.0" } @@ -26,8 +27,7 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' - implementation 'io.github.muddz:styleabletoast:2.4.0' -// implementation project(':styleabletoast') + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.9.0' + implementation project(':styleabletoast') } diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 655e7dd..8542227 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -11,7 +11,8 @@ + android:screenOrientation="portrait" + android:exported="true"> diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3d21570..709dee4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/readme.md b/readme.md index b004a96..13a0e06 100644 --- a/readme.md +++ b/readme.md @@ -5,12 +5,12 @@ An Android library that takes the standard toast to the next level with many styling options. Style your toasts either by code or with a style in `styles.xml`. ## Cases - +Toast cases ## Example with a style -1) Define a style in `styles.xml`. All available attributes: +1. Define a style in `styles.xml`. All available attributes: ```xml - ``` -2) Pass your style in the static constructor and call `show();` +2. Pass your style in the static constructor and call `show();` ```java StyleableToast.makeText(context, "Hello World!", Toast.LENGTH_LONG, R.style.mytoast).show(); diff --git a/styleabletoast/build.gradle b/styleabletoast/build.gradle index e5f1fe3..5a7d7f8 100644 --- a/styleabletoast/build.gradle +++ b/styleabletoast/build.gradle @@ -4,11 +4,12 @@ plugins { } android { - compileSdk 30 + namespace "io.github.muddz.styleabletoast" + compileSdk 34 defaultConfig { - minSdk 16 - targetSdk 30 + minSdk 21 + targetSdk 34 } buildTypes { release { @@ -19,5 +20,5 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.appcompat:appcompat:1.6.1' }