Merge pull request #19 from syxc/dev

Dev
syxc · May 16, 2024 · 9e778a7 · 9e778a7
2 parents d9d20b6 + 18afe95
commit 9e778a7
Show file tree

Hide file tree

Showing 39 changed files with 105 additions and 73 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -4,14 +4,14 @@ plugins {
   alias(libs.plugins.android.application)
   kotlin("android")
   alias(libs.plugins.cashapp.redwood)
-  id("com.github.build.logic")
+  id("com.jithub.build.logic")
 }
 
 android {
-  namespace = "com.github.app.android"
+  namespace = "com.jithub.app.android"
   compileSdk = Versions.compileSdk
   defaultConfig {
-    applicationId = "com.github.app.android"
+    applicationId = "com.jithub.app.android"
     minSdk = Versions.minSdk
     targetSdk = Versions.targetSdk
     versionCode = Versions.versionCode

diff --git a/androidApp/src/main/java/com/github/app/android/AppTheme.kt b/androidApp/src/main/java/com/github/app/android/AppTheme.kt
@@ -1,4 +1,4 @@
-package com.github.app.android
+package com.jithub.app.android
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.shape.RoundedCornerShape

diff --git a/androidApp/src/main/java/com/github/app/android/MainActivity.kt b/androidApp/src/main/java/com/github/app/android/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.github.app.android
+package com.jithub.app.android
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -13,11 +13,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import app.cash.redwood.composeui.RedwoodContent
 import app.cash.redwood.layout.composeui.ComposeUiRedwoodLayoutWidgetFactory
-import com.github.app.shared.Counter
-import com.github.app.shared.MR
-import com.github.app.shared.core.StringList
-import com.github.app.shared.redwood.composeui.ComposeUiWidgetFactory
-import com.github.app.shared.redwood.widget.SchemaWidgetSystem
+import com.jithub.app.shared.Counter
+import com.jithub.app.shared.MR
+import com.jithub.app.shared.core.StringList
+import com.jithub.app.shared.redwood.composeui.ComposeUiWidgetFactory
+import com.jithub.app.shared.redwood.widget.SchemaWidgetSystem
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
   }
 }
 
-group = "com.github.app.buildlogic"
+group = "com.jithub.app.buildlogic"
 
 kotlin {
   jvmToolchain(17)
@@ -33,7 +33,7 @@ dependencies {
 gradlePlugin {
   plugins {
     register("build-logic") {
-      id = "com.github.build.logic"
+      id = "com.jithub.build.logic"
       implementationClass = "BuildLogic"
     }
   }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,19 +24,54 @@ plugins {
   alias(libs.plugins.kotlin.cocoapods) apply false
   // alias(libs.plugins.jetbrains.compose) apply false
   alias(libs.plugins.cashapp.redwood) apply false
-  id("com.github.build.logic") apply false
+  id("com.jithub.build.logic") apply false
 }
 
-subprojects {
-  tasks.withType<JavaCompile> {
+allprojects {
+  repositories {
+    google {
+      mavenContent {
+        includeGroupAndSubgroups("androidx")
+        includeGroupAndSubgroups("com.android")
+        includeGroupAndSubgroups("com.google")
+      }
+    }
+    mavenCentral()
+    maven("https://jitpack.io")
+  }
+
+  tasks.withType<JavaCompile>().configureEach {
     sourceCompatibility = Versions.java.toString()
     targetCompatibility = Versions.java.toString()
   }
 
-  tasks.withType<KotlinCompile> {
+  tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
       jvmTarget = Versions.java.toString()
     }
+    compilerOptions {
+      // Treat all Kotlin warnings as errors
+      allWarningsAsErrors = true
+      freeCompilerArgs.addAll(
+        // Enable default methods in interfaces
+        "-Xjvm-default=all",
+        // Enable context receivers
+        "-Xcontext-receivers",
+        // Enable K2 compiler
+        "-language-version=2.0",
+        "-Xsuppress-version-warnings"
+      )
+    }
+  }
+}
+
+gradle.taskGraph.whenReady {
+  tasks.forEach { task ->
+    /* Encountering the “Unable to make progress running work” Error in Gradle? */
+    // gradle.startParameter.excludedTaskNames.addAll(listOf(":build-logic:convention:testClasses"))
+    if (task?.name?.contains(":testClasses", ignoreCase = false) == true) {
+      task.enabled = false
+    }
   }
 }
 

diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig
@@ -1,3 +1,3 @@
 TEAM_ID=
-BUNDLE_ID=com.github.app.ios
+BUNDLE_ID=com.jithub.app.ios
 APP_NAME=kmp-app
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -153,7 +153,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1130;
 				LastUpgradeCheck = 1530;
-				ORGANIZATIONNAME = github.com;
+				ORGANIZATIONNAME = jithub.com;
 				TargetAttributes = {
 					7555FF7A242A565900829871 = {
 						CreatedOnToolsVersion = 11.3.1;

diff --git a/iosApp/iosApp/AppDelegate.swift b/iosApp/iosApp/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  iosApp
 //
 //  Created by syxc on 2024/5/9.
-//  Copyright © 2024 github.com. All rights reserved.
+//  Copyright © 2024 jithub.com. All rights reserved.
 //
 
 import shared

diff --git a/iosApp/iosApp/CounterViewController.swift b/iosApp/iosApp/CounterViewController.swift
@@ -3,7 +3,7 @@
 //  iosApp
 //
 //  Created by syxc on 2024/5/9.
-//  Copyright © 2024 github.com. All rights reserved.
+//  Copyright © 2024 jithub.com. All rights reserved.
 //
 
 import Foundation

diff --git a/iosApp/iosApp/HomeViewController.swift b/iosApp/iosApp/HomeViewController.swift
@@ -3,7 +3,7 @@
 //  iosApp
 //
 //  Created by syxc on 2024/5/9.
-//  Copyright © 2024 github.com. All rights reserved.
+//  Copyright © 2024 jithub.com. All rights reserved.
 //
 
 import SwiftUI

diff --git a/iosApp/iosApp/Launch Screen.storyboard b/iosApp/iosApp/Launch Screen.storyboard
@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2024 github.com. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2024 jithub.com. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
                                 <rect key="frame" x="0.0" y="817.66666666666663" width="393" height="14.333333333333371"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

diff --git a/iosApp/iosApp/MokoView.swift b/iosApp/iosApp/MokoView.swift
@@ -3,7 +3,7 @@
 //  iosApp
 //
 //  Created by syxc on 2024/5/9.
-//  Copyright © 2024 github.com. All rights reserved.
+//  Copyright © 2024 jithub.com. All rights reserved.
 //
 
 import shared

diff --git a/iosApp/iosApp/MokoViewController.swift b/iosApp/iosApp/MokoViewController.swift
@@ -3,7 +3,7 @@
 //  iosApp
 //
 //  Created by syxc on 2024/5/9.
-//  Copyright © 2024 github.com. All rights reserved.
+//  Copyright © 2024 jithub.com. All rights reserved.
 //
 
 import SwiftUI

diff --git a/redwood/schema/build.gradle.kts b/redwood/schema/build.gradle.kts
@@ -8,5 +8,5 @@ dependencies {
 }
 
 redwoodSchema {
-  type.set("com.github.app.shared.redwood.Schema")
+  type.set("com.jithub.app.shared.redwood.Schema")
 }
diff --git a/redwood/schema/compose/build.gradle.kts b/redwood/schema/compose/build.gradle.kts
@@ -31,7 +31,7 @@ kotlin {
 
 redwoodSchema {
   source.set(projects.redwood.schema)
-  type.set("com.github.app.shared.redwood.Schema")
+  type.set("com.jithub.app.shared.redwood.Schema")
 }
 
 /* task 'testClasses' not found in project */

diff --git a/redwood/schema/entity/src/commonMain/kotlin/com/github/app/shared/ButtonType.kt b/redwood/schema/entity/src/commonMain/kotlin/com/github/app/shared/ButtonType.kt
@@ -1,4 +1,4 @@
-package com.github.app.shared
+package com.jithub.app.shared
 
 enum class ButtonType {
   Primary,

diff --git a/redwood/schema/entity/src/commonMain/kotlin/com/github/app/shared/InputType.kt b/redwood/schema/entity/src/commonMain/kotlin/com/github/app/shared/InputType.kt
@@ -1,4 +1,4 @@
-package com.github.app.shared
+package com.jithub.app.shared
 
 enum class InputType {
   Text,

diff --git a/redwood/schema/entity/src/commonMain/kotlin/com/github/app/shared/TextType.kt b/redwood/schema/entity/src/commonMain/kotlin/com/github/app/shared/TextType.kt
@@ -1,4 +1,4 @@
-package com.github.app.shared
+package com.jithub.app.shared
 
 enum class TextType {
   Header,

diff --git a/redwood/schema/redwood-api.xml b/redwood/schema/redwood-api.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<schema type="com.github.app.shared.redwood.Schema" version="1">
-  <widget tag="2" type="com.github.app.shared.redwood.Text">
+<schema type="com.jithub.app.shared.redwood.Schema" version="1">
+  <widget tag="2" type="com.jithub.app.shared.redwood.Text">
     <property name="text" tag="1" type="kotlin.String?" />
   </widget>
-  <widget tag="3" type="com.github.app.shared.redwood.Button">
+  <widget tag="3" type="com.jithub.app.shared.redwood.Button">
     <property name="text" tag="1" type="kotlin.String?" />
     <property name="enabled" tag="2" type="kotlin.Boolean" />
     <event name="onClick" nullable="true" tag="3" />

diff --git a/redwood/schema/src/main/kotlin/com/github/app/shared/redwood/schema.kt b/redwood/schema/src/main/kotlin/com/github/app/shared/redwood/schema.kt
@@ -1,6 +1,6 @@
 @file:Suppress("ktlint:standard:filename")
 
-package com.github.app.shared.redwood
+package com.jithub.app.shared.redwood
 
 import app.cash.redwood.layout.RedwoodLayout
 import app.cash.redwood.schema.Default

diff --git a/redwood/schema/testing/build.gradle.kts b/redwood/schema/testing/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
 
 redwoodSchema {
   source.set(projects.redwood.schema)
-  type.set("com.github.app.shared.redwood.Schema")
+  type.set("com.jithub.app.shared.redwood.Schema")
 }
 
 /* task 'testClasses' not found in project */

diff --git a/redwood/schema/widget/build.gradle.kts b/redwood/schema/widget/build.gradle.kts
@@ -30,7 +30,7 @@ kotlin {
 
 redwoodSchema {
   source.set(projects.redwood.schema)
-  type.set("com.github.app.shared.redwood.Schema")
+  type.set("com.jithub.app.shared.redwood.Schema")
 }
 
 /* task 'testClasses' not found in project */

diff --git a/redwood/shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/Color.kt b/redwood/shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/Color.kt
@@ -1,4 +1,4 @@
-package com.github.app.shared.redwood.composeui
+package com.jithub.app.shared.redwood.composeui
 
 import androidx.compose.ui.graphics.Color
 

diff --git a/...ared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/ComposeUiButton.kt b/...ared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/ComposeUiButton.kt
@@ -1,6 +1,5 @@
-package com.github.app.shared.redwood.composeui
+package com.jithub.app.shared.redwood.composeui
 
-import app.cash.redwood.Modifier as RedwoodModifier
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
@@ -9,7 +8,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import com.github.app.shared.redwood.widget.Button
+import app.cash.redwood.Modifier as RedwoodModifier
+import com.jithub.app.shared.redwood.widget.Button
 
 internal class ComposeUiButton : Button<@Composable () -> Unit> {
   private var text by mutableStateOf("")

diff --git a/...shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/ComposeUiText.kt b/...shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/ComposeUiText.kt
@@ -1,12 +1,12 @@
-package com.github.app.shared.redwood.composeui
+package com.jithub.app.shared.redwood.composeui
 
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import app.cash.redwood.Modifier
-import com.github.app.shared.redwood.widget.Text
+import com.jithub.app.shared.redwood.widget.Text
 
 internal class ComposeUiText : Text<@Composable () -> Unit> {
   private var text by mutableStateOf("")

diff --git a/...mposeui/src/main/kotlin/com/github/app/shared/redwood/composeui/ComposeUiWidgetFactory.kt b/...mposeui/src/main/kotlin/com/github/app/shared/redwood/composeui/ComposeUiWidgetFactory.kt
@@ -1,9 +1,9 @@
-package com.github.app.shared.redwood.composeui
+package com.jithub.app.shared.redwood.composeui
 
 import androidx.compose.runtime.Composable
-import com.github.app.shared.redwood.widget.Button
-import com.github.app.shared.redwood.widget.SchemaWidgetFactory
-import com.github.app.shared.redwood.widget.Text
+import com.jithub.app.shared.redwood.widget.Button
+import com.jithub.app.shared.redwood.widget.SchemaWidgetFactory
+import com.jithub.app.shared.redwood.widget.Text
 
 object ComposeUiWidgetFactory : SchemaWidgetFactory<@Composable () -> Unit> {
   override fun Text(): Text<@Composable () -> Unit> = ComposeUiText()

diff --git a/redwood/shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/Theme.kt b/redwood/shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/Theme.kt
@@ -1,4 +1,4 @@
-package com.github.app.shared.redwood.composeui
+package com.jithub.app.shared.redwood.composeui
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme

diff --git a/redwood/shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/Type.kt b/redwood/shared-composeui/src/main/kotlin/com/github/app/shared/redwood/composeui/Type.kt
@@ -1,4 +1,4 @@
-package com.github.app.shared.redwood.composeui
+package com.jithub.app.shared.redwood.composeui
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Shapes

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -48,9 +48,6 @@ include(":redwood:schema:widget")
 include(":redwood:schema:testing")
 include(":redwood:shared-composeui")
 
-/* Encountering the “Unable to make progress running work” Error in Gradle? */
-gradle.startParameter.excludedTaskNames.addAll(listOf(":build-logic:convention:testClasses"))
-
 check(JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
   "This project needs to be run with Java 17 or higher (found: ${JavaVersion.current()})."
 }
diff --git a/shared-compose/build.gradle.kts b/shared-compose/build.gradle.kts
@@ -52,15 +52,15 @@ kotlin {
 }
 
 android {
-  namespace = "com.github.app.share"
+  namespace = "com.jithub.app.share"
   compileSdk = Versions.compileSdk
 
   sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
   sourceSets["main"].res.srcDirs("src/androidMain/res")
   sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
   defaultConfig {
-    // applicationId = "com.github.app.share"
+    // applicationId = "com.jithub.app.share"
     minSdk = Versions.minSdk
   }
 

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -34,7 +34,7 @@ kotlin {
     podfile = project.file("../iosApp/Podfile")
     framework {
       baseName = "shared"
-      binaryOptions["bundleId"] = "com.github.app.shared"
+      binaryOptions["bundleId"] = "com.jithub.app.shared"
       isStatic = true
       export(moko.resources)
       export("dev.icerock.moko:graphics:0.9.0")
@@ -74,11 +74,11 @@ kotlin {
 }
 
 multiplatformResources {
-  resourcesPackage.set("com.github.app.shared")
+  resourcesPackage.set("com.jithub.app.shared")
 }
 
 android {
-  namespace = "com.github.app.shared"
+  namespace = "com.jithub.app.shared"
   compileSdk = Versions.compileSdk
 
   defaultConfig {

diff --git a/shared/src/androidMain/kotlin/Platform.android.kt b/shared/src/androidMain/kotlin/Platform.android.kt
@@ -1,5 +1,5 @@
 import android.os.Build
-import com.github.app.shared.MR
+import com.jithub.app.shared.MR
 import dev.icerock.moko.resources.StringResource
 
 class AndroidPlatform : Platform {