Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: gradle 8, kotlin 2.0 & update bundletool #5799

Merged
merged 5 commits into from
Jul 1, 2024
Merged

feat: gradle 8, kotlin 2.0 & update bundletool #5799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62d6187
feat: gradle 8, kotlin 2.0 & update bundletool
triniwiz Apr 16, 2024
7e444f8
refactor: don't explicitly pass through sdk info, let user app.gradle…
rigor789 Apr 16, 2024
827b35e
release: 8.8.0-alpha.0
NathanWalker Apr 16, 2024
ba74df5
release: 8.8.0-alpha.1
NathanWalker May 31, 2024
b23767e
feat: use kotlin 2.0.0
NathanWalker Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions lib/services/android-plugin-build-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { Builder, parseString } from "xml2js";
import {
IRuntimeGradleVersions,
INodePackageManager,
IAndroidToolsInfo,
IWatchIgnoreListService,
} from "../declarations";
import { IPlatformsDataService } from "../definitions/platform";
Expand Down Expand Up @@ -47,7 +46,6 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
private $fs: IFileSystem,
private $childProcess: IChildProcess,
private $hostInfo: IHostInfo,
private $androidToolsInfo: IAndroidToolsInfo,
private $logger: ILogger,
private $packageManager: INodePackageManager,
private $projectData: IProjectData,
Expand Down Expand Up @@ -423,6 +421,31 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
);
this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);

// gets the package from the AndroidManifest to use as the namespace or fallback to the `org.nativescript.${shortPluginName}`
const shortPluginName = getShortPluginName(pluginName);

const manifestPath = path.join(
pluginTempDir,
"src",
"main",
"AndroidManifest.xml"
);
const manifestContent = this.$fs.readText(manifestPath);

let packageName = `org.nativescript.${shortPluginName}`;
const xml = await this.getXml(manifestContent);
if (xml["manifest"]) {
if (xml["manifest"]["$"]["package"]) {
packageName = xml["manifest"]["$"]["package"];
}
}

this.replaceFileContent(
buildGradlePath,
"{{pluginNamespace}}",
packageName
);
}

private async getRuntimeGradleVersions(
Expand Down Expand Up @@ -777,18 +800,6 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
private async buildPlugin(
pluginBuildSettings: IBuildAndroidPluginData
): Promise<void> {
if (!pluginBuildSettings.androidToolsInfo) {
this.$androidToolsInfo.validateInfo({
showWarningsAsErrors: true,
validateTargetSdk: true,
projectDir: pluginBuildSettings.projectDir,
});
pluginBuildSettings.androidToolsInfo =
this.$androidToolsInfo.getToolsInfo({
projectDir: pluginBuildSettings.projectDir,
});
}

const gradlew =
pluginBuildSettings.gradlePath ??
(this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
Expand All @@ -798,8 +809,6 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
pluginBuildSettings.pluginDir,
"assembleRelease",
`-PtempBuild=true`,
`-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
`-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
];
Expand Down
10 changes: 0 additions & 10 deletions lib/services/android/gradle-build-args-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import * as path from "path";
import { Configurations } from "../../common/constants";
import { IGradleBuildArgsService } from "../../definitions/gradle";
import { IAndroidToolsInfo } from "../../declarations";
import { IAndroidBuildData } from "../../definitions/build";
import { IHooksService, IAnalyticsService } from "../../common/declarations";
import { injector } from "../../common/yok";
import { IProjectData } from "../../definitions/project";

export class GradleBuildArgsService implements IGradleBuildArgsService {
constructor(
private $androidToolsInfo: IAndroidToolsInfo,
private $hooksService: IHooksService,
private $analyticsService: IAnalyticsService,
private $staticConfig: Config.IStaticConfig,
Expand Down Expand Up @@ -49,18 +47,10 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
private getBaseTaskArgs(buildData: IAndroidBuildData): string[] {
const args = this.getBuildLoggingArgs();

const toolsInfo = this.$androidToolsInfo.getToolsInfo({
projectDir: buildData.projectDir,
});

// ensure we initialize project data
this.$projectData.initializeProjectData(buildData.projectDir);

args.push(
`-PcompileSdk=android-${toolsInfo.compileSdkVersion}`,
`-PtargetSdk=${toolsInfo.targetSdkVersion}`,
`-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`,
`-PgenerateTypings=${toolsInfo.generateTypings}`,
`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`
);
Expand Down
Loading