Merge pull request #40 from skydoves/migrate/version-catelog

Migrate maven publication plugin & gradle ktx scripts
skydoves · Oct 1, 2023 · 62e0d29 · 62e0d29
2 parents 764298c + 57c458f
commit 62e0d29
Show file tree

Hide file tree

Showing 54 changed files with 587 additions and 454 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -17,7 +17,7 @@ jobs:
               uses: actions/[email protected]
               with:
                   distribution: adopt
-                  java-version: 11
+                  java-version: 17
             - name: spotless
               run: ./gradlew spotlessCheck
 
@@ -31,7 +31,7 @@ jobs:
               uses: actions/[email protected]
               with:
                   distribution: adopt
-                  java-version: 11
+                  java-version: 17
             - name: API check
               run: ./gradlew apiCheck
 
@@ -44,7 +44,7 @@ jobs:
               uses: actions/[email protected]
               with:
                   distribution: adopt
-                  java-version: 11
+                  java-version: 17
 
             - name: Cache Gradle and wrapper
               uses: actions/cache@v3

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -13,22 +13,26 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/[email protected]
-      - name: Set up JDK 11
+
+      - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: adopt
-          java-version: 11
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Grant Permission to Execute Gradle
+        run: chmod +x gradlew
+
       - name: Release build
-        run: ./gradlew assemble --scan
-      - name: Source jar and dokka
-        run: ./gradlew androidSourcesJar javadocJar --scan
+        run: ./gradlew assemble --scan -x :benchmark:pixel6api31Setup -x :benchmark:pixel6api31NonMinifiedReleaseAndroidTest -x :benchmark:collectNonMinifiedReleaseBaselineProfile
+
       - name: Publish to MavenCentral
-        run: ./gradlew publishReleasePublicationToSonatypeRepository --scan
+        run: |
+          ./gradlew publishAllPublicationsToMavenCentral --no-daemon --no-parallel
         env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
           SNAPSHOT: true
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,30 +2,35 @@ name: Publish
 
 on:
   release:
-    types: [released]
+    types: [ released ]
+  workflow_dispatch:
 
 jobs:
   publish:
-    name: Release build and publish
+    name: Snapshot build and publish
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/[email protected]
-      - name: Set up JDK 11
+
+      - name: Set up JDK 17
         uses: actions/[email protected]
         with:
-          distribution: adopt
-          java-version: 11
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Grant Permission to Execute Gradle
+        run: chmod +x gradlew
+
       - name: Release build
-        run: ./gradlew assemble --scan
-      - name: Source jar and dokka
-        run: ./gradlew androidSourcesJar javadocJar --scan
+        run: ./gradlew assemble --scan -x :benchmark:pixel6api31Setup -x :benchmark:pixel6api31NonMinifiedReleaseAndroidTest -x :benchmark:collectNonMinifiedReleaseBaselineProfile
+
       - name: Publish to MavenCentral
-        run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository --scan
+        run: |
+          ./gradlew publishAllPublicationsToMavenCentral --no-configuration-cache
         env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
diff --git a/app/build.gradle b/app/build.gradle
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -0,0 +1,55 @@
+import com.github.skydoves.colorpicker.compose.Configuration
+
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+  id(libs.plugins.android.application.get().pluginId)
+  id(libs.plugins.kotlin.android.get().pluginId)
+  id(libs.plugins.baseline.profile.get().pluginId)
+}
+android {
+  namespace = "com.github.skydoves.colorpickercomposedemo"
+  compileSdk = Configuration.compileSdk
+  defaultConfig {
+    applicationId = "com.github.skydoves.colorpickercomposedemo"
+    minSdk = Configuration.minSdk
+    targetSdk = Configuration.targetSdk
+    versionCode = Configuration.versionCode
+    versionName = Configuration.versionName
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = libs.versions.jvmTarget.get()
+  }
+
+  buildFeatures {
+    compose = true
+    buildConfig = true
+  }
+
+  composeOptions {
+    kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
+  }
+
+  lint {
+    abortOnError = false
+  }
+}
+
+dependencies {
+  implementation(project(":colorpicker-compose"))
+
+  implementation(platform(libs.androidx.compose.bom))
+  implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.compose.ui)
+  implementation(libs.androidx.compose.ui.tooling)
+  implementation(libs.androidx.compose.material)
+  implementation(libs.androidx.compose.foundation)
+  implementation(libs.androidx.compose.runtime)
+
+  implementation(libs.photo.picker)
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Designed and developed by 2022 skydoves (Jaewoong Eum)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.github.skydoves.colorpickercomposedemo">
 
@@ -20,4 +35,4 @@
     </activity>
   </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/kotlin/com/github/skydoves/colorpickercomposedemo/MainActivity.kt b/app/src/main/kotlin/com/github/skydoves/colorpickercomposedemo/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 skydoves (Jaewoong Eum)
+ * Designed and developed by 2022 skydoves (Jaewoong Eum)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.skydoves.colorpickercomposedemo
 
 import android.os.Bundle

diff --git a/app/src/main/kotlin/com/github/skydoves/colorpickercomposedemo/MainScreen.kt b/app/src/main/kotlin/com/github/skydoves/colorpickercomposedemo/MainScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 skydoves (Jaewoong Eum)
+ * Designed and developed by 2022 skydoves (Jaewoong Eum)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.skydoves.colorpickercomposedemo
 
 import androidx.annotation.DrawableRes

diff --git a/app/src/main/kotlin/com/github/skydoves/colorpickercomposedemo/PhotoPickerIcon.kt b/app/src/main/kotlin/com/github/skydoves/colorpickercomposedemo/PhotoPickerIcon.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 skydoves (Jaewoong Eum)
+ * Designed and developed by 2022 skydoves (Jaewoong Eum)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.skydoves.colorpickercomposedemo
 
 import android.annotation.SuppressLint

diff --git a/...com/github/skydoves/colorpickercomposedemo/screens/HsvColorPickerColoredSelectorScreen.kt b/...com/github/skydoves/colorpickercomposedemo/screens/HsvColorPickerColoredSelectorScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 skydoves (Jaewoong Eum)
+ * Designed and developed by 2022 skydoves (Jaewoong Eum)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.skydoves.colorpickercomposedemo.screens
 
 import androidx.compose.foundation.layout.Box

diff --git a/.../main/kotlin/com/github/skydoves/colorpickercomposedemo/screens/ImageColorPickerScreen.kt b/.../main/kotlin/com/github/skydoves/colorpickercomposedemo/screens/ImageColorPickerScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 skydoves (Jaewoong Eum)
+ * Designed and developed by 2022 skydoves (Jaewoong Eum)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.github.skydoves.colorpickercomposedemo.screens
 
 import androidx.compose.foundation.layout.Column

diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,3 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Designed and developed by 2022 skydoves (Jaewoong Eum)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
@@ -27,4 +43,4 @@
         android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
         android:strokeWidth="1"
         android:strokeColor="#00000000" />
-</vector>
+</vector>
diff --git a/app/src/main/res/drawable/ic_gallery.xml b/app/src/main/res/drawable/ic_gallery.xml
@@ -1,6 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Designed and developed by 2022 skydoves (Jaewoong Eum)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-      
+
     <path android:fillColor="@android:color/white" android:pathData="M15.96,10.29l-2.75,3.54 -1.96,-2.36L8.5,15h11l-3.54,-4.71zM3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,17L7,17L7,3h14v14z"/>
-    
+
 </vector>