Skip to content

Commit

Permalink
Merge pull request #4 from w2sv/master
Browse files Browse the repository at this point in the history
Renovate build & clean up repo
  • Loading branch information
SmartToolFactory committed Apr 25, 2023
2 parents adbfa90 + 47556e5 commit 4ed13cd
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 101 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
colors with **Name** based on distance to pre-defined elements in json in 3D space using `Red`
, `Green`, `Blue` values of picked Color.

| M2 Color Swatches | M3 Tone Palettes | Gradient Rotation|
| ----------|-----------| -----------|
| <img src="./screenshots/material_design2.gif" width="300">| <img src="./screenshots/material_design3.gif" width="300"> | <img src="./screenshots/gradient_rotation.gif" width="300"> |
| M2 Color Swatches | M3 Tone Palettes | Gradient Rotation |
|------------------------------------------------------------|------------------------------------------------------------|-------------------------------------------------------------|
| <img src="./screenshots/material_design2.gif" width="300"> | <img src="./screenshots/material_design3.gif" width="300"> | <img src="./screenshots/gradient_rotation.gif" width="300"> |

## Gradle Setup

Expand Down
14 changes: 5 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
buildscript {
ext {
compose_version = '1.2.0-beta02'
compose_version = '1.4.1'
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.2.0' apply false
id 'com.android.library' version '7.2.0' apply false
id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
}

task clean(type: Delete) {
delete rootProject.buildDir
plugins {
id 'com.android.application' version '8.0.0-rc01' apply false
id 'com.android.library' version '8.0.0-rc01' apply false
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
}
45 changes: 23 additions & 22 deletions extendedcolors/build.gradle
Original file line number Diff line number Diff line change
@@ -1,58 +1,59 @@
plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'maven-publish'
}

android {
compileSdk 31

namespace "com.smarttoolfactory.extendedcolors"
compileSdk 33
defaultConfig {
minSdk 21
targetSdk 31

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
kotlin {
jvmToolchain(17)
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_version
kotlinCompilerExtensionVersion '1.4.4'
}

packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
}
}
}

dependencies {
afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.release

implementation 'androidx.core:core-ktx:1.7.0'
groupId = 'com.smarttoolfactory'
artifactId = 'extendedcolors'
version = '0.0.1'
}
}
}
}

dependencies {
implementation 'androidx.core:core-ktx:1.10.0'

// Jetpack Compose
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-tooling:$compose_version"
implementation "androidx.compose.runtime:runtime:$compose_version"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
}
Empty file removed extendedcolors/consumer-rules.pro
Empty file.

This file was deleted.

5 changes: 0 additions & 5 deletions extendedcolors/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

25 changes: 5 additions & 20 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http:https://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
kotlin.code.style=official

org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http:https://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
org.gradle.parallel=true
org.gradle.caching=true

android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat May 21 20:06:04 TRT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
2 changes: 2 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jdk:
- openjdk17

0 comments on commit 4ed13cd

Please sign in to comment.