Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 07:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(projects): reorganize project APIs in different packages

Browse Source
This commit is contained in:
Akash Yadav
2024-06-28 13:11:14 +05:30
parent 11858d7dce
commit 1ed5f77dae
40 changed files with 318 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/app/src/main/java/com/itsaky/androidide/actions/build/QuickRunWithCancellationAction.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import com.itsaky.androidide.actions.markInvisible
import com.itsaky.androidide.actions.openApplicationModuleChooser
import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.models.ApkMetadata
import com.itsaky.androidide.projects.api.AndroidModule
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.projects.builder.BuildService
import com.itsaky.androidide.resources.R
import com.itsaky.androidide.tooling.api.messages.result.TaskExecutionResult
core/app/src/main/java/com/itsaky/androidide/actions/internalActionUtils.kt
+1 -1
View File
@@ -20,7 +20,7 @@ package com.itsaky.androidide.actions
import android.content.Context
import com.itsaky.androidide.R
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.api.AndroidModule
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.utils.DialogUtils
import com.itsaky.androidide.utils.ILogger
import com.itsaky.androidide.utils.flashError
core/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt
+1 -1
View File
@@ -40,7 +40,7 @@ import com.itsaky.androidide.lsp.IDELanguageClientImpl
import com.itsaky.androidide.lsp.java.utils.CancelChecker
import com.itsaky.androidide.preferences.internal.GeneralPreferences
import com.itsaky.androidide.projects.internal.ProjectManagerImpl
import com.itsaky.androidide.projects.api.GradleProject
import com.itsaky.androidide.projects.GradleProject
import com.itsaky.androidide.projects.builder.BuildService
import com.itsaky.androidide.services.builder.GradleBuildService
import com.itsaky.androidide.services.builder.GradleBuildServiceConnnection
core/app/src/main/java/com/itsaky/androidide/fragments/RunTasksDialogFragment.kt
+1 -4
View File
@@ -18,7 +18,6 @@
package com.itsaky.androidide.fragments
import android.app.Dialog
import android.graphics.Color
import android.os.Build
import android.os.Bundle
import android.text.Editable
@@ -27,7 +26,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.ViewGroup.MarginLayoutParams
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat.Type.navigationBars
import androidx.core.view.WindowInsetsCompat.Type.statusBars
import androidx.core.view.updateLayoutParams
@@ -46,7 +44,7 @@ import com.itsaky.androidide.databinding.LayoutRunTaskDialogBinding
import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.models.Checkable
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.api.GradleProject
import com.itsaky.androidide.projects.GradleProject
import com.itsaky.androidide.projects.builder.BuildService
import com.itsaky.androidide.resources.R
import com.itsaky.androidide.tasks.executeAsync
@@ -55,7 +53,6 @@ import com.itsaky.androidide.utils.SingleTextWatcher
import com.itsaky.androidide.utils.doOnApplyWindowInsets
import com.itsaky.androidide.utils.flashError
import com.itsaky.androidide.utils.flashInfo
import com.itsaky.androidide.utils.updateSystemBarColors
import com.itsaky.androidide.viewmodel.RunTasksViewModel
import org.slf4j.LoggerFactory
core/app/src/main/java/com/itsaky/androidide/indexing/platform/PlatformIndexService.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package com.itsaky.androidide.indexing.platform
import com.google.auto.service.AutoService
import com.itsaky.androidide.indexing.IIndexService
import com.itsaky.androidide.projects.api.Project
import com.itsaky.androidide.projects.Project
import org.slf4j.LoggerFactory
import java.io.File
core/indexing-api/src/main/java/com/itsaky/androidide/indexing/IIndexService.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package com.itsaky.androidide.indexing
import com.itsaky.androidide.projects.api.Project
import com.itsaky.androidide.projects.Project
import kotlinx.coroutines.Deferred
import java.io.File
core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/DefaultLanguageServerRegistry.java
+1 -1
View File
@@ -20,7 +20,7 @@ package com.itsaky.androidide.lsp.api;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.itsaky.androidide.eventbus.events.project.ProjectInitializedEvent;
import com.itsaky.androidide.projects.api.Project;
import com.itsaky.androidide.projects.Project;
import com.itsaky.androidide.utils.ILogger;
import java.util.HashMap;
import java.util.Map;
core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServer.kt
+1 -1
View File
@@ -46,7 +46,7 @@ import com.itsaky.androidide.lsp.models.ReferenceResult
import com.itsaky.androidide.lsp.models.SignatureHelp
import com.itsaky.androidide.lsp.models.SignatureHelpParams
import com.itsaky.androidide.models.Range
import com.itsaky.androidide.projects.api.Project
import com.itsaky.androidide.projects.Project
import java.nio.file.Path
/**
core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/commonCompletionUtils.kt
+2 -2
View File
@@ -19,8 +19,8 @@ package com.itsaky.androidide.lsp.util
import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.api.AndroidModule
import com.itsaky.androidide.projects.api.ModuleProject
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.projects.ModuleProject
import com.itsaky.androidide.xml.resources.ResourceTableRegistry
import com.itsaky.androidide.xml.versions.ApiVersions
import com.itsaky.androidide.xml.widgets.WidgetTable
core/projects/src/main/java/com/itsaky/androidide/projects/api/GradleProject.kt → core/projects/src/main/java/com/itsaky/androidide/projects/GradleProject.kt
+1 -2
View File
@@ -15,7 +15,7 @@
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
*/
package com.itsaky.androidide.projects.api
package com.itsaky.androidide.projects
import com.itsaky.androidide.tooling.api.ProjectType
import com.itsaky.androidide.tooling.api.models.GradleTask
@@ -34,7 +34,6 @@ import java.util.concurrent.CompletableFuture
* @param buildDir The build directory of the project.
* @param buildScript The Gradle buildscript file of the project.
* @param tasks The tasks of the project.
* @param subModules The submodules of the project.
* @author Akash Yadav
*/
open class GradleProject(
core/projects/src/main/java/com/itsaky/androidide/projects/IProjectManager.kt
+1 -3
View File
@@ -20,9 +20,7 @@ package com.itsaky.androidide.projects
import androidx.annotation.RestrictTo
import com.android.builder.model.v2.models.ProjectSyncIssues
import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.projects.api.AndroidModule
import com.itsaky.androidide.projects.api.ModuleProject
import com.itsaky.androidide.projects.api.Project
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.projects.builder.BuildService
import com.itsaky.androidide.tooling.api.IProject
import com.itsaky.androidide.tooling.api.models.BuildVariantInfo
core/projects/src/main/java/com/itsaky/androidide/projects/api/ModuleProject.kt → core/projects/src/main/java/com/itsaky/androidide/projects/ModuleProject.kt
+2 -1
View File
@@ -15,13 +15,14 @@
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
*/
package com.itsaky.androidide.projects.api
package com.itsaky.androidide.projects
import android.text.TextUtils
import androidx.annotation.RestrictTo
import com.itsaky.androidide.builder.model.IJavaCompilerSettings
import com.itsaky.androidide.javac.services.fs.CacheFSInfoSingleton
import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.projects.classpath.JarFsClasspathReader
import com.itsaky.androidide.projects.util.BootClasspathProvider
import com.itsaky.androidide.tooling.api.models.GradleTask
core/projects/src/main/java/com/itsaky/androidide/projects/api/Project.kt → core/projects/src/main/java/com/itsaky/androidide/projects/Project.kt
+2 -1
View File
@@ -15,10 +15,11 @@
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
*/
package com.itsaky.androidide.projects.api
package com.itsaky.androidide.projects
import com.android.builder.model.v2.ide.ProjectType
import com.android.builder.model.v2.models.ProjectSyncIssues
import com.itsaky.androidide.projects.android.AndroidModule
import java.io.File
import java.nio.file.Path
core/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt → core/projects/src/main/java/com/itsaky/androidide/projects/android/AndroidModule.kt
+3 -1
View File
@@ -15,7 +15,7 @@
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
*/
package com.itsaky.androidide.projects.api
package com.itsaky.androidide.projects.android
import com.android.SdkConstants
import com.android.aaptcompiler.AaptResourceType
@@ -31,6 +31,8 @@ import com.itsaky.androidide.builder.model.DefaultSourceSetContainer
import com.itsaky.androidide.builder.model.DefaultViewBindingOptions
import com.itsaky.androidide.builder.model.UNKNOWN_PACKAGE
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.ModuleProject
import com.itsaky.androidide.projects.Project
import com.itsaky.androidide.tooling.api.ProjectType.Android
import com.itsaky.androidide.tooling.api.models.BasicAndroidVariantMetadata
import com.itsaky.androidide.tooling.api.models.GradleTask
core/projects/src/main/java/com/itsaky/androidide/projects/internal/ProjectManagerImpl.kt
+3 -3
View File
@@ -32,9 +32,9 @@ import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.projects.CachingProject
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.R
import com.itsaky.androidide.projects.api.AndroidModule
import com.itsaky.androidide.projects.api.ModuleProject
import com.itsaky.androidide.projects.api.Project
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.projects.ModuleProject
import com.itsaky.androidide.projects.Project
import com.itsaky.androidide.projects.builder.BuildService
import com.itsaky.androidide.tasks.executeAsync
import com.itsaky.androidide.tooling.api.IAndroidProject
core/projects/src/main/java/com/itsaky/androidide/projects/internal/ProjectTransformer.kt
+4 -4
View File
@@ -17,10 +17,10 @@
package com.itsaky.androidide.projects.internal
import com.itsaky.androidide.projects.api.AndroidModule
import com.itsaky.androidide.projects.api.GradleProject
import com.itsaky.androidide.projects.api.JavaModule
import com.itsaky.androidide.projects.api.Project
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.projects.GradleProject
import com.itsaky.androidide.projects.java.JavaModule
import com.itsaky.androidide.projects.Project
import com.itsaky.androidide.tooling.api.IAndroidProject
import com.itsaky.androidide.tooling.api.IGradleProject
import com.itsaky.androidide.tooling.api.IJavaProject
core/projects/src/main/java/com/itsaky/androidide/projects/api/JavaModule.kt → core/projects/src/main/java/com/itsaky/androidide/projects/java/JavaModule.kt
+2 -1
View File
@@ -15,10 +15,11 @@
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
*/
package com.itsaky.androidide.projects.api
package com.itsaky.androidide.projects.java
import com.itsaky.androidide.builder.model.IJavaCompilerSettings
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.ModuleProject
import com.itsaky.androidide.tooling.api.ProjectType.Java
import com.itsaky.androidide.tooling.api.models.GradleTask
import com.itsaky.androidide.tooling.api.models.JavaContentRoot
core/projects/src/main/java/com/itsaky/androidide/projects/util/projects.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package com.itsaky.androidide.projects.util
import androidx.annotation.RestrictTo
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.api.AndroidModule
import com.itsaky.androidide.projects.android.AndroidModule
/**
* **For testing purposes only!**
core/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt
+2
View File
@@ -19,7 +19,9 @@ package com.itsaky.androidide.projects.api
import com.google.common.truth.Truth.assertThat
import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.projects.android.AndroidModule
import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.projects.java.JavaModule
import com.itsaky.androidide.projects.builder.BuildService
import com.itsaky.androidide.testing.tooling.ToolingApiTestLauncher
import com.itsaky.androidide.tooling.api.IAndroidProject