diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0b9ea62 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 69e8615..ae3f30a 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index af94618..b3097bd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + - + diff --git a/README.md b/README.md index 6072ddf..e04db30 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation 'dev.romainguy:v9:0.2.0' + implementation 'dev.romainguy:v9:0.3.0' } ``` diff --git a/build.gradle b/build.gradle index 9ae8dd1..484bbe4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ buildscript { ext { - compose_version = '1.4.2' - compose_compiler_version = '1.4.6' - pathway_version = '0.12.0' + compose_version = '1.5.4' + compose_compiler_version = '1.5.6' + pathway_version = '0.17.0' } repositories { google() @@ -10,9 +10,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.0' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20' - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.24.0' - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.10' + classpath 'com.android.tools.build:gradle:8.2.0' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.20' } } diff --git a/gradle.properties b/gradle.properties index 6258e40..96de423 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=dev.romainguy -VERSION_NAME=0.2.0 +VERSION_NAME=0.3.0 SONATYPE_HOST=S01 RELEASE_SIGNING_ENABLED=true @@ -23,9 +23,8 @@ POM_NAME=v9 POM_ARTIFACT_ID=v9 POM_PACKAGING=aar -org.gradle.jvmargs=-Xmx512M +org.gradle.jvmargs=-Xmx2048M android.useAndroidX=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 35c7070..8e784f5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 22 12:55:00 PDT 2022 +#Tue Dec 12 17:36:28 PST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/v9-demo/build.gradle b/v9-demo/build.gradle index 1b9479a..2ef67fa 100644 --- a/v9-demo/build.gradle +++ b/v9-demo/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdkPreview 'UpsideDownCake' - defaultConfig { applicationId "dev.romainguy.graphics.v9.demo" minSdk 28 - targetSdk 33 + targetSdk 34 + compileSdk 34 + versionCode 1 versionName "1.0" @@ -19,10 +19,14 @@ android { } buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + debug { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } } compileOptions { @@ -51,13 +55,13 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.1' - implementation 'com.google.android.material:material:1.8.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' + implementation 'androidx.activity:activity-compose:1.8.1' + implementation 'com.google.android.material:material:1.10.0' implementation "dev.romainguy:pathway:$pathway_version" diff --git a/v9/build.gradle b/v9/build.gradle index fbd8425..3a2ad50 100644 --- a/v9/build.gradle +++ b/v9/build.gradle @@ -12,7 +12,8 @@ android { defaultConfig { minSdk 21 - targetSdk 33 + compileSdk 34 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -29,7 +30,7 @@ android { } dependencies { - androidTestImplementation 'androidx.core:core-ktx:1.10.0' + androidTestImplementation 'androidx.core:core-ktx:1.12.0' androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation 'androidx.test.ext:junit:1.1.5'