Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f445165

Browse files
authoredDec 27, 2024
[#5] Update project structure and gradle version (#6)
1 parent 96802df commit f445165

29 files changed

+316
-385
lines changed
 

‎LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎README.md

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎build.gradle.kts

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,45 @@
1-
buildscript {
2-
val kotlinVersion by extra { "1.5.31" }
1+
plugins {
2+
`java-gradle-plugin`
3+
`kotlin-dsl`
4+
id("com.gradle.plugin-publish") version "1.3.0"
5+
}
36

4-
repositories {
5-
google()
6-
mavenCentral()
7-
maven("https://plugins.gradle.org/m2/")
8-
}
7+
val pluginId = "io.github.MatrixDev.android-rust"
8+
9+
group = pluginId
10+
version = "0.3.2"
11+
12+
gradlePlugin {
13+
website = "https://github.com/MatrixDev/GradleAndroidRustPlugin"
14+
vcsUrl = "https://github.com/MatrixDev/GradleAndroidRustPlugin.git"
915

10-
dependencies {
11-
classpath("com.android.tools.build:gradle:7.2.2")
12-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
16+
plugins {
17+
create("AndroidRust") {
18+
id = pluginId
19+
implementationClass = "dev.matrix.agp.rust.AndroidRustPlugin"
20+
displayName = "Plugin for building Rust with Cargo in Android projects"
21+
description = "This plugin helps with building Rust JNI libraries with Cargo for use in Android projects."
22+
}
1323
}
1424
}
1525

16-
allprojects {
26+
publishing {
1727
repositories {
18-
google()
19-
mavenCentral()
20-
maven("https://plugins.gradle.org/m2/")
28+
maven {
29+
url = uri(layout.buildDirectory.dir("repo"))
30+
}
2131
}
2232
}
2333

24-
tasks.register("clean", Delete::class) {
25-
delete(rootProject.buildDir)
26-
rootProject.childProjects.forEach { project ->
27-
delete(project.value.buildDir)
28-
}
34+
repositories {
35+
mavenCentral()
36+
google()
37+
maven("https://plugins.gradle.org/m2/")
38+
}
39+
40+
dependencies {
41+
gradleApi()
42+
43+
implementation(libs.agp)
44+
implementation(libs.agp.api)
2945
}

‎example/app/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
plugins {
2-
id("com.android.application")
3-
id("org.jetbrains.kotlin.android")
4-
id("io.github.MatrixDev.android-rust")
2+
alias(libs.plugins.android.application)
3+
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.android.rust)
55
}
66

77
android {
8+
namespace = "dev.matrix.rust"
89
compileSdk = 33
910
ndkVersion = "25.2.9519653"
1011

‎example/build.gradle.kts

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
1-
buildscript {
2-
val kotlinVersion by extra { "1.7.0" }
3-
4-
repositories {
5-
google()
6-
mavenCentral()
7-
}
8-
9-
dependencies {
10-
classpath("com.android.tools.build:gradle:7.2.2")
11-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
12-
classpath("io.github.MatrixDev.android-rust:plugin:*")
13-
}
14-
}
15-
16-
allprojects {
17-
repositories {
18-
google()
19-
mavenCentral()
20-
}
21-
}
22-
23-
task<Delete>("clean") {
24-
delete(rootProject.buildDir)
25-
rootProject.childProjects.values.forEach { project ->
26-
delete(project.buildDir)
27-
}
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
plugins {
3+
alias(libs.plugins.android.application) apply false
4+
alias(libs.plugins.kotlin.android) apply false
5+
alias(libs.plugins.android.rust) apply false
286
}

‎example/gradle/libs.versions.toml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[versions]
2+
agp = "8.7.3"
3+
kotlin = "2.0.0"
4+
coreKtx = "1.15.0"
5+
junit = "4.13.2"
6+
junitVersion = "1.1.5"
7+
espressoCore = "3.5.1"
8+
lifecycleRuntimeKtx = "2.8.7"
9+
activityCompose = "1.9.3"
10+
composeBom = "2024.04.01"
11+
12+
[libraries]
13+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
14+
junit = { group = "junit", name = "junit", version.ref = "junit" }
15+
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
16+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
17+
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
18+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
19+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
20+
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
21+
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
22+
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
23+
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
24+
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
25+
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
26+
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
27+
28+
[plugins]
29+
android-application = { id = "com.android.application", version.ref = "agp" }
30+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
31+
android-rust = { id = "io.github.MatrixDev.android-rust", version = "0.3.2" }
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Jun 12 14:27:36 EEST 2022
1+
#Wed Dec 04 11:21:35 EET 2024
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎example/settings.gradle.kts

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
1-
rootProject.name = "android-rust-example"
1+
pluginManagement {
2+
repositories {
3+
google {
4+
content {
5+
includeGroupByRegex("com\\.android.*")
6+
includeGroupByRegex("com\\.google.*")
7+
includeGroupByRegex("androidx.*")
8+
}
9+
}
10+
mavenCentral()
11+
gradlePluginPortal()
12+
}
13+
}
214

15+
dependencyResolutionManagement {
16+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
17+
repositories {
18+
mavenCentral()
19+
google()
20+
maven("https://plugins.gradle.org/m2/")
21+
}
22+
}
23+
24+
rootProject.name = "android-rust-example"
325
include(":app")
426

527
includeBuild("..") {
628
dependencySubstitution {
7-
substitute(module("io.github.MatrixDev.android-rust:plugin")).using(project(":plugin"))
29+
substitute(module("io.github.MatrixDev.android-rust:plugin"))
830
}
931
}

‎gradle.properties

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎gradle/libs.versions.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[versions]
2+
agp = "8.7.2"
3+
4+
[libraries]
5+
agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
6+
agp-api = { module = "com.android.tools.build:gradle-api", version.ref = "agp" }

‎gradle/wrapper/gradle-wrapper.jar

-15.3 KB
Binary file not shown.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Jun 12 14:27:36 EEST 2022
1+
#Wed Dec 04 11:21:35 EET 2024
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 176 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/usr/bin/env sh
1+
#!/bin/sh
22

33
#
4-
# Copyright 2015 the original author or authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -15,69 +15,104 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
20-
##
21-
## Gradle start up script for UN*X
22-
##
22+
#
23+
# Gradle start up script for POSIX generated by Gradle.
24+
#
25+
# Important for running:
26+
#
27+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
28+
# noncompliant, but you have some other compliant shell such as ksh or
29+
# bash, then to run this script, type that shell name before the whole
30+
# command line, like:
31+
#
32+
# ksh Gradle
33+
#
34+
# Busybox and similar reduced shells will NOT work, because this script
35+
# requires all of these POSIX shell features:
36+
# * functions;
37+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
38+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
39+
# * compound commands having a testable exit status, especially «case»;
40+
# * various built-in commands including «command», «set», and «ulimit».
41+
#
42+
# Important for patching:
43+
#
44+
# (2) This script targets any POSIX shell, so it avoids extensions provided
45+
# by Bash, Ksh, etc; in particular arrays are avoided.
46+
#
47+
# The "traditional" practice of packing multiple parameters into a
48+
# space-separated string is a well documented source of bugs and security
49+
# problems, so this is (mostly) avoided, by progressively accumulating
50+
# options in "$@", and eventually passing that to Java.
51+
#
52+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
53+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
54+
# see the in-line comments for details.
55+
#
56+
# There are tweaks for specific operating systems such as AIX, CygWin,
57+
# Darwin, MinGW, and NonStop.
58+
#
59+
# (3) This script is generated from the Groovy template
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
61+
# within the Gradle project.
62+
#
63+
# You can find Gradle at https://github.com/gradle/gradle/.
64+
#
2365
##############################################################################
2466

2567
# Attempt to set APP_HOME
68+
2669
# Resolve links: $0 may be a link
27-
PRG="$0"
28-
# Need this for relative symlinks.
29-
while [ -h "$PRG" ] ; do
30-
ls=`ls -ld "$PRG"`
31-
link=`expr "$ls" : '.*-> \(.*\)$'`
32-
if expr "$link" : '/.*' > /dev/null; then
33-
PRG="$link"
34-
else
35-
PRG=`dirname "$PRG"`"/$link"
36-
fi
70+
app_path=$0
71+
72+
# Need this for daisy-chained symlinks.
73+
while
74+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
75+
[ -h "$app_path" ]
76+
do
77+
ls=$( ls -ld "$app_path" )
78+
link=${ls#*' -> '}
79+
case $link in #(
80+
/*) app_path=$link ;; #(
81+
*) app_path=$APP_HOME$link ;;
82+
esac
3783
done
38-
SAVED="`pwd`"
39-
cd "`dirname \"$PRG\"`/" >/dev/null
40-
APP_HOME="`pwd -P`"
41-
cd "$SAVED" >/dev/null
4284

43-
APP_NAME="Gradle"
44-
APP_BASE_NAME=`basename "$0"`
45-
46-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
85+
# This is normally unused
86+
# shellcheck disable=SC2034
87+
APP_BASE_NAME=${0##*/}
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
4891

4992
# Use the maximum available, or set MAX_FD != -1 to use that value.
50-
MAX_FD="maximum"
93+
MAX_FD=maximum
5194

5295
warn () {
5396
echo "$*"
54-
}
97+
} >&2
5598

5699
die () {
57100
echo
58101
echo "$*"
59102
echo
60103
exit 1
61-
}
104+
} >&2
62105

63106
# OS specific support (must be 'true' or 'false').
64107
cygwin=false
65108
msys=false
66109
darwin=false
67110
nonstop=false
68-
case "`uname`" in
69-
CYGWIN* )
70-
cygwin=true
71-
;;
72-
Darwin* )
73-
darwin=true
74-
;;
75-
MINGW* )
76-
msys=true
77-
;;
78-
NONSTOP* )
79-
nonstop=true
80-
;;
111+
case "$( uname )" in #(
112+
CYGWIN* ) cygwin=true ;; #(
113+
Darwin* ) darwin=true ;; #(
114+
MSYS* | MINGW* ) msys=true ;; #(
115+
NONSTOP* ) nonstop=true ;;
81116
esac
82117

83118
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
87122
if [ -n "$JAVA_HOME" ] ; then
88123
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89124
# IBM's JDK on AIX uses strange locations for the executables
90-
JAVACMD="$JAVA_HOME/jre/sh/java"
125+
JAVACMD=$JAVA_HOME/jre/sh/java
91126
else
92-
JAVACMD="$JAVA_HOME/bin/java"
127+
JAVACMD=$JAVA_HOME/bin/java
93128
fi
94129
if [ ! -x "$JAVACMD" ] ; then
95130
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
98133
location of your Java installation."
99134
fi
100135
else
101-
JAVACMD="java"
102-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136+
JAVACMD=java
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103140
104141
Please set the JAVA_HOME variable in your environment to match the
105142
location of your Java installation."
143+
fi
106144
fi
107145

108146
# Increase the maximum file descriptors if we can.
109-
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110-
MAX_FD_LIMIT=`ulimit -H -n`
111-
if [ $? -eq 0 ] ; then
112-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113-
MAX_FD="$MAX_FD_LIMIT"
114-
fi
115-
ulimit -n $MAX_FD
116-
if [ $? -ne 0 ] ; then
117-
warn "Could not set maximum file descriptor limit: $MAX_FD"
118-
fi
119-
else
120-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121-
fi
147+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
148+
case $MAX_FD in #(
149+
max*)
150+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
151+
# shellcheck disable=SC2039,SC3045
152+
MAX_FD=$( ulimit -H -n ) ||
153+
warn "Could not query maximum file descriptor limit"
154+
esac
155+
case $MAX_FD in #(
156+
'' | soft) :;; #(
157+
*)
158+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
160+
ulimit -n "$MAX_FD" ||
161+
warn "Could not set maximum file descriptor limit to $MAX_FD"
162+
esac
122163
fi
123164

124-
# For Darwin, add options to specify how the application appears in the dock
125-
if $darwin; then
126-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127-
fi
165+
# Collect all arguments for the java command, stacking in reverse order:
166+
# * args from the command line
167+
# * the main class name
168+
# * -classpath
169+
# * -D...appname settings
170+
# * --module-path (only if needed)
171+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
128172

129173
# For Cygwin or MSYS, switch paths to Windows format before running java
130-
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133-
134-
JAVACMD=`cygpath --unix "$JAVACMD"`
135-
136-
# We build the pattern for arguments to be converted via cygpath
137-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138-
SEP=""
139-
for dir in $ROOTDIRSRAW ; do
140-
ROOTDIRS="$ROOTDIRS$SEP$dir"
141-
SEP="|"
142-
done
143-
OURCYGPATTERN="(^($ROOTDIRS))"
144-
# Add a user-defined pattern to the cygpath arguments
145-
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147-
fi
174+
if "$cygwin" || "$msys" ; then
175+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
176+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
177+
178+
JAVACMD=$( cygpath --unix "$JAVACMD" )
179+
148180
# Now convert the arguments - kludge to limit ourselves to /bin/sh
149-
i=0
150-
for arg in "$@" ; do
151-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153-
154-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156-
else
157-
eval `echo args$i`="\"$arg\""
181+
for arg do
182+
if
183+
case $arg in #(
184+
-*) false ;; # don't mess with options #(
185+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
186+
[ -e "$t" ] ;; #(
187+
*) false ;;
188+
esac
189+
then
190+
arg=$( cygpath --path --ignore --mixed "$arg" )
158191
fi
159-
i=`expr $i + 1`
192+
# Roll the args list around exactly as many times as the number of
193+
# args, so each arg winds up back in the position where it started, but
194+
# possibly modified.
195+
#
196+
# NB: a `for` loop captures its iteration list before it begins, so
197+
# changing the positional parameters here affects neither the number of
198+
# iterations, nor the values presented in `arg`.
199+
shift # remove old arg
200+
set -- "$@" "$arg" # push replacement arg
160201
done
161-
case $i in
162-
0) set -- ;;
163-
1) set -- "$args0" ;;
164-
2) set -- "$args0" "$args1" ;;
165-
3) set -- "$args0" "$args1" "$args2" ;;
166-
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167-
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168-
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169-
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170-
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171-
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172-
esac
173202
fi
174203

175-
# Escape application args
176-
save () {
177-
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178-
echo " "
179-
}
180-
APP_ARGS=`save "$@"`
181204

182-
# Collect all arguments for the java command, following the shell quoting and substitution rules
183-
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
213+
214+
set -- \
215+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216+
-classpath "$CLASSPATH" \
217+
org.gradle.wrapper.GradleWrapperMain \
218+
"$@"
219+
220+
# Stop when "xargs" is not available.
221+
if ! command -v xargs >/dev/null 2>&1
222+
then
223+
die "xargs is not available"
224+
fi
225+
226+
# Use "xargs" to parse quoted args.
227+
#
228+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
229+
#
230+
# In Bash we could simply go:
231+
#
232+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
233+
# set -- "${ARGS[@]}" "$@"
234+
#
235+
# but POSIX shell has neither arrays nor command substitution, so instead we
236+
# post-process each arg (as a line of input to sed) to backslash-escape any
237+
# character that might be a shell metacharacter, then use eval to reverse
238+
# that process (while maintaining the separation between arguments), and wrap
239+
# the whole thing up as a single "set" statement.
240+
#
241+
# This will of course break if any of these variables contains a newline or
242+
# an unmatched quote.
243+
#
244+
245+
eval "set -- $(
246+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
247+
xargs -n1 |
248+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
249+
tr '\n' ' '
250+
)" '"$@"'
184251

185252
exec "$JAVACMD" "$@"

‎gradlew.bat

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

17-
@if "%DEBUG%" == "" @echo off
19+
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
1921
@rem
2022
@rem Gradle startup script for Windows
@@ -25,7 +27,8 @@
2527
if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4043

4144
set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
46+
if %ERRORLEVEL% equ 0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5053

5154
goto fail
5255

@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6467

6568
goto fail
6669

@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7578

7679
:end
7780
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
81+
if %ERRORLEVEL% equ 0 goto mainEnd
7982

8083
:fail
8184
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8285
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
8590

8691
:mainEnd
8792
if "%OS%"=="Windows_NT" endlocal

‎plugin/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎plugin/build.gradle.kts

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎settings.gradle.kts

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plugin/src/main/java/dev/matrix/agp/rust/AndroidRustPlugin.kt renamed to ‎src/main/kotlin/dev/matrix/agp/rust/AndroidRustPlugin.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.gradle.api.Plugin
99
import org.gradle.api.Project
1010
import org.gradle.api.tasks.TaskProvider
1111
import java.io.File
12-
import java.util.*
12+
import java.util.Locale
1313

1414
//
1515
// TODO: migrate to variant API with artifacts when JNI will be supported
@@ -55,6 +55,7 @@ class AndroidRustPlugin : Plugin<Project> {
5555
this.cargoTargetDirectory.set(moduleBuildDirectory)
5656
}.dependsOn(cleanTask)
5757
}
58+
5859
else -> null
5960
}
6061

‎plugin/src/main/java/dev/matrix/agp/rust/RustBuildTask.kt renamed to ‎src/main/kotlin/dev/matrix/agp/rust/RustBuildTask.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.gradle.api.provider.Property
88
import org.gradle.api.tasks.Input
99
import org.gradle.api.tasks.TaskAction
1010
import java.io.File
11-
import java.util.*
1211

1312
internal abstract class RustBuildTask : DefaultTask() {
1413
@get:Input
@@ -60,7 +59,7 @@ internal abstract class RustBuildTask : DefaultTask() {
6059

6160
val cargoTargetTriplet = abi.rustTargetTriple
6261
.replace('-', '_')
63-
.toUpperCase(Locale.getDefault())
62+
.uppercase()
6463

6564
project.exec {
6665
standardOutput = System.out

‎plugin/src/main/java/dev/matrix/agp/rust/RustInstaller.kt renamed to ‎src/main/kotlin/dev/matrix/agp/rust/RustInstaller.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package dev.matrix.agp.rust
22

3-
import dev.matrix.agp.rust.utils.*
3+
import dev.matrix.agp.rust.utils.Abi
4+
import dev.matrix.agp.rust.utils.NullOutputStream
5+
import dev.matrix.agp.rust.utils.Os
6+
import dev.matrix.agp.rust.utils.SemanticVersion
7+
import dev.matrix.agp.rust.utils.log
48
import org.gradle.api.Project
59
import java.io.ByteArrayOutputStream
610

0 commit comments

Comments
 (0)
Please sign in to comment.