Refactor // Rename package name and init package uploading

uninit-org · Nov 28, 2023 · 69a953b · 69a953b
1 parent 0ef31ad
commit 69a953b
Show file tree

Hide file tree

Showing 189 changed files with 672 additions and 519 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ permissions:
   contents: write
 jobs:
   build:
-    name: Build
+    name: Buildbuild.yml
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
@@ -43,21 +43,7 @@ jobs:
         with:
           path: genesis/common/build
           key: ${{ runner.os }}-genesis-common-${{ hashFiles('genesis/common/**', 'build.gradle.kts', 'gradle.properties', 'gradle/libs.versions.toml') }}
-      - name: Cache genesisDiscordApi
-        uses: actions/cache@v3
-        with:
-          path: genesis/discord/api/build
-          key: ${{ runner.os }}-genesis-discord-api-${{ hashFiles('genesis/discord/api/**', 'build.gradle.kts', 'gradle.properties', 'gradle/libs.versions.toml') }}
-      - name: Cache genesisDiscordClient
-        uses: actions/cache@v3
-        with:
-          path: genesis/discord/client/build
-          key: ${{ runner.os }}-genesis-discord-client-${{ hashFiles('genesis/discord/client/**', 'build.gradle.kts', 'gradle.properties', 'gradle/libs.versions.toml') }}
-      - name: Cache genesisApi
-        uses: actions/cache@v3
-        with:
-          path: genesis/genesisApi/build
-          key: ${{ runner.os }}-genesis-genesisApi-${{ hashFiles('genesis/genesisApi/**', 'build.gradle.kts', 'gradle.properties', 'gradle/libs.versions.toml') }}
+
 
 
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,43 @@
+on:
+  push:
+    paths:
+      - .github/workflows/publish.yml
+      - genesis/discord/**
+      - genesis/genesisApi/**
+  release:
+    types: [ created ]
+name: Publish
+jobs:
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          cache: "gradle"
+
+      - name: Cache genesisDiscordApi
+        uses: actions/cache@v3
+        with:
+          path: genesis/discord/api/build
+          key: ${{ runner.os }}-genesis-discord-api-${{ hashFiles('genesis/discord/api/**', 'build.gradle.kts', 'gradle.properties', 'gradle/libs.versions.toml') }}
+      - name: Cache genesisDiscordClient
+        uses: actions/cache@v3
+        with:
+          path: genesis/discord/client/build
+          key: ${{ runner.os }}-genesis-discord-client-${{ hashFiles('genesis/discord/client/**', 'build.gradle.kts', 'gradle.properties', 'gradle/libs.versions.toml') }}
+      - name: Cache genesisApi
+        uses: actions/cache@v3
+        with:
+          path: genesis/genesisApi/build
+          key: ${{ runner.os }}-genesis-genesisApi-${{ hashFiles('genesis/genesisApi/**', 'build.gradle.kts', 'gradle.properties', 'gradle/libs.versions.toml') }}
+
+      - name: Publish
+        run: |
+          ./gradlew --no-daemon publish
+        env:
+          REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }}
diff --git a/.idea/artifacts/api_desktop_0_0_1.xml b/.idea/artifacts/api_desktop_0_0_1.xml
diff --git a/.idea/artifacts/client_desktop_0_0_1.xml b/.idea/artifacts/client_desktop_0_0_1.xml
diff --git a/.idea/artifacts/genesisApi_desktop_0_0_1.xml b/.idea/artifacts/genesisApi_desktop_0_0_1.xml
diff --git a/appAndroid/build.gradle.kts b/appAndroid/build.gradle.kts
@@ -17,12 +17,12 @@ kotlin {
 
 android {
     compileSdk = (findProperty("android.compileSdk") as String).toInt()
-    namespace = "xyz.genesisapp.genesis"
+    namespace = "uninit.genesis"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 
     defaultConfig {
-        applicationId = "xyz.genesisapp.genesis"
+        applicationId = "uninit.genesis"
         minSdk = (findProperty("android.minSdk") as String).toInt()
         targetSdk = (findProperty("android.targetSdk") as String).toInt()
         versionCode = 1

diff --git a/appAndroid/src/androidMain/kotlin/xyz/genesisapp/genesis/AppActivity.kt b/appAndroid/src/androidMain/kotlin/xyz/genesisapp/genesis/AppActivity.kt
@@ -1,11 +1,11 @@
-package xyz.genesisapp.genesis
+package uninit.genesis
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.CompositionLocalProvider
-import xyz.genesisapp.genesis.app.MainView
-import xyz.genesisapp.genesis.app.platform.android.LocalApplicationContext
+import uninit.genesis.app.MainView
+import uninit.genesis.app.platform.android.LocalApplicationContext
 
 class AppActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/appDesktop/build.gradle.kts b/appDesktop/build.gradle.kts
@@ -20,7 +20,7 @@ kotlin {
 
 compose.desktop {
     application {
-        mainClass = "xyz.genesisapp.genesis.Application"
+        mainClass = "uninit.genesis.Application"
 
         nativeDistributions {
             targetFormats(
@@ -34,7 +34,7 @@ compose.desktop {
 
             val iconsRoot = project.file("../genesis/app/src/commonMain/resources/icons")
             macOS {
-                bundleID = "xyz.genesisapp.genesis"
+                bundleID = "uninit.genesis"
                 iconFile.set(iconsRoot.resolve("genesis.icns"))
             }
             windows {

diff --git a/appDesktop/src/jvmMain/kotlin/xyz/genesisapp/genesis/Application.kt b/appDesktop/src/jvmMain/kotlin/xyz/genesisapp/genesis/Application.kt
@@ -1,11 +1,11 @@
-package xyz.genesisapp.genesis
+package uninit.genesis
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.window.ApplicationScope
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import xyz.genesisapp.genesis.app.MainView
+import uninit.genesis.app.MainView
 
 
 class Application {

diff --git a/appIos/genesis.xcodeproj/project.pbxproj b/appIos/genesis.xcodeproj/project.pbxproj
@@ -438,7 +438,7 @@
 					"-framework",
 					genesisApp,
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = xyz.genesisapp.genesis;
+				PRODUCT_BUNDLE_IDENTIFIER = uninit.genesis;
 				PRODUCT_NAME = Genesis;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -473,7 +473,7 @@
 					"-framework",
 					genesisApp,
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = xyz.genesisapp.genesis;
+				PRODUCT_BUNDLE_IDENTIFIER = uninit.genesis;
 				PRODUCT_NAME = Genesis;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -505,7 +505,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = xyz.genesisapp.genesis.sharesheet;
+				PRODUCT_BUNDLE_IDENTIFIER = uninit.genesis.sharesheet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
@@ -538,7 +538,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = xyz.genesisapp.genesis.sharesheet;
+				PRODUCT_BUNDLE_IDENTIFIER = uninit.genesis.sharesheet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/appIos/genesis/Info.plist b/appIos/genesis/Info.plist
@@ -24,7 +24,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>xyz.genesisapp.genesis</string>
+			<string>uninit.genesis</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>genesis</string>

diff --git a/genesis/app/build.gradle.kts b/genesis/app/build.gradle.kts
@@ -13,7 +13,7 @@ kotlin {
 
     iosArm64().binaries.framework {
         baseName = "genesisApp"
-        binaryOption("bundleId", "xyz.genesisapp.genesis.app")
+        binaryOption("bundleId", "uninit.genesis.app")
         isStatic = true
     }
 
@@ -79,7 +79,7 @@ kotlin {
 
 android {
     compileSdk = (findProperty("android.compileSdk") as String).toInt()
-    namespace = "xyz.genesisapp.genesis.app"
+    namespace = "uninit.genesis.app"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")

diff --git a/genesis/app/src/androidMain/kotlin/xyz/genesisapp/genesis/app/di/httpModule.android.kt b/genesis/app/src/androidMain/kotlin/xyz/genesisapp/genesis/app/di/httpModule.android.kt
@@ -1,4 +1,4 @@
-package xyz.genesisapp.genesis.app.di
+package uninit.genesis.app.di
 
 import io.ktor.client.engine.*
 import io.ktor.client.engine.okhttp.*

diff --git a/...sis/app/src/androidMain/kotlin/xyz/genesisapp/genesis/app/di/preferencesModule.android.kt b/...sis/app/src/androidMain/kotlin/xyz/genesisapp/genesis/app/di/preferencesModule.android.kt
@@ -1,10 +1,10 @@
-package xyz.genesisapp.genesis.app.di
+package uninit.genesis.app.di
 
 import androidx.compose.runtime.Composable
 import org.koin.core.module.Module
 import org.koin.dsl.module
-import xyz.genesisapp.common.preferences.PreferencesManager
-import xyz.genesisapp.genesis.app.platform.android.LocalApplicationContext
+import uninit.genesis.common.preferences.PreferencesManager
+import uninit.genesis.app.platform.android.LocalApplicationContext
 
 @Composable
 actual fun preferencesModule(): Module {

diff --git a/genesis/app/src/androidMain/kotlin/xyz/genesisapp/genesis/app/main.android.kt b/genesis/app/src/androidMain/kotlin/xyz/genesisapp/genesis/app/main.android.kt
@@ -1,4 +1,4 @@
-package xyz.genesisapp.genesis.app
+package uninit.genesis.app
 
 import androidx.compose.runtime.Composable
 import io.github.aakira.napier.Antilog

diff --git a/...androidMain/kotlin/xyz/genesisapp/genesis/app/platform/android/LocalApplicationContext.kt b/...androidMain/kotlin/xyz/genesisapp/genesis/app/platform/android/LocalApplicationContext.kt
@@ -1,4 +1,4 @@
-package xyz.genesisapp.genesis.app.platform.android
+package uninit.genesis.app.platform.android
 
 import androidx.compose.runtime.compositionLocalOf
 

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/App.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/App.kt
@@ -1,4 +1,4 @@
-package xyz.genesisapp.genesis.app
+package uninit.genesis.app
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -16,20 +16,20 @@ import io.github.aakira.napier.Antilog
 import io.github.aakira.napier.Napier
 import org.koin.compose.KoinApplication
 import org.koin.compose.getKoin
-import xyz.genesisapp.common.compose.koin.uninitModule
-import xyz.genesisapp.common.preferences.PreferencesManager
-import xyz.genesisapp.discord.client.GenesisClient
-import xyz.genesisapp.discord.client.enum.LogLevel
-import xyz.genesisapp.genesis.app.data.DataStore
-import xyz.genesisapp.genesis.app.di.dataStoreModule
-import xyz.genesisapp.genesis.app.di.genesisApiModule
-import xyz.genesisapp.genesis.app.di.genesisClientModule
-import xyz.genesisapp.genesis.app.di.httpModule
-import xyz.genesisapp.genesis.app.di.platformHttpEngineFactory
-import xyz.genesisapp.genesis.app.di.preferencesModule
-import xyz.genesisapp.genesis.app.theme.LocalContextColors
-import xyz.genesisapp.genesis.app.theme.ThemeProvider
-import xyz.genesisapp.genesis.app.ui.screens.RootScreen
+import uninit.genesis.common.compose.koin.uninitModule
+import uninit.genesis.common.preferences.PreferencesManager
+import uninit.genesis.discord.client.GenesisClient
+import uninit.genesis.discord.client.enum.LogLevel
+import uninit.genesis.app.data.DataStore
+import uninit.genesis.app.di.dataStoreModule
+import uninit.genesis.app.di.genesisApiModule
+import uninit.genesis.app.di.genesisClientModule
+import uninit.genesis.app.di.httpModule
+import uninit.genesis.app.di.platformHttpEngineFactory
+import uninit.genesis.app.di.preferencesModule
+import uninit.genesis.app.theme.LocalContextColors
+import uninit.genesis.app.theme.ThemeProvider
+import uninit.genesis.app.ui.screens.RootScreen
 
 @Composable
 fun App() {

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/Util.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/Util.kt
@@ -1,13 +1,13 @@
-package xyz.genesisapp.genesis.app
+package uninit.genesis.app
 
 import cafe.adriel.voyager.navigator.Navigator
 import org.koin.core.Koin
-import xyz.genesisapp.discord.client.GenesisClient
-import xyz.genesisapp.genesis.app.data.DataStore
-import xyz.genesisapp.genesis.app.di.dataStoreModule
-import xyz.genesisapp.genesis.app.di.genesisApiModule
-import xyz.genesisapp.genesis.app.di.genesisClientModule
-import xyz.genesisapp.genesis.app.ui.screens.RootScreen
+import uninit.genesis.discord.client.GenesisClient
+import uninit.genesis.app.data.DataStore
+import uninit.genesis.app.di.dataStoreModule
+import uninit.genesis.app.di.genesisApiModule
+import uninit.genesis.app.di.genesisClientModule
+import uninit.genesis.app.ui.screens.RootScreen
 
 fun ReloadClient(koin: Koin, nav: Navigator) {
     var parent: Navigator = nav.parent!!

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/data/DataStore.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/data/DataStore.kt
@@ -1,13 +1,13 @@
-package xyz.genesisapp.genesis.app.data
+package uninit.genesis.app.data
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import xyz.genesisapp.common.fytix.EventBus
-import xyz.genesisapp.common.getTimeInMillis
-import xyz.genesisapp.discord.api.types.Snowflake
-import xyz.genesisapp.genesis.app.ui.screens.client.ClientTab
+import uninit.genesis.common.fytix.EventBus
+import uninit.genesis.common.getTimeInMillis
+import uninit.genesis.discord.api.types.Snowflake
+import uninit.genesis.app.ui.screens.client.ClientTab
 
 class DataStore() : EventBus("DataStore") {
 

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/dataStoreModule.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/dataStoreModule.kt
@@ -1,7 +1,7 @@
-package xyz.genesisapp.genesis.app.di
+package uninit.genesis.app.di
 
 import org.koin.dsl.module
-import xyz.genesisapp.genesis.app.data.DataStore
+import uninit.genesis.app.data.DataStore
 
 
 fun dataStoreModule() = module {

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/genesisApiModule.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/genesisApiModule.kt
@@ -1,7 +1,7 @@
-package xyz.genesisapp.genesis.app.di
+package uninit.genesis.app.di
 
 import org.koin.dsl.module
-import xyz.genesisapp.genesisApi.GenesisApiClient
+import uninit.genesisApi.GenesisApiClient
 
 
 fun genesisApiModule() = module {

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/genesisClientModule.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/genesisClientModule.kt
@@ -1,7 +1,7 @@
-package xyz.genesisapp.genesis.app.di
+package uninit.genesis.app.di
 
 import org.koin.dsl.module
-import xyz.genesisapp.discord.client.GenesisClient
+import uninit.genesis.discord.client.GenesisClient
 
 
 fun genesisClientModule() = module {

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/httpModule.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/httpModule.kt
@@ -1,4 +1,4 @@
-package xyz.genesisapp.genesis.app.di
+package uninit.genesis.app.di
 
 import io.ktor.client.engine.*
 import org.koin.dsl.module

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/preferencesModule.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/di/preferencesModule.kt
@@ -1,4 +1,4 @@
-package xyz.genesisapp.genesis.app.di
+package uninit.genesis.app.di
 
 import androidx.compose.runtime.Composable
 import org.koin.core.module.Module

diff --git a/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/theme/LocalContextColors.kt b/genesis/app/src/commonMain/kotlin/xyz/genesisapp/genesis/app/theme/LocalContextColors.kt
@@ -1,4 +1,4 @@
-package xyz.genesisapp.genesis.app.theme
+package uninit.genesis.app.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.compositionLocalOf