Skip to content

Commit 7218fcd

Browse files
committed
Update Gradle and AGP. Seems to Just Work.
1 parent 196528e commit 7218fcd

16 files changed

+362
-50
lines changed

build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.41'
2+
ext.kotlin_version = '1.3.50'
3+
ext.agp_version = '4.0.1'
34
ext.plugin_version = '0.8.7'
45

56
repositories {
@@ -9,7 +10,7 @@ buildscript {
910
}
1011
}
1112
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.2'
13+
classpath "com.android.tools.build:gradle:$agp_version"
1314
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1415
}
1516
}

gradle/wrapper/gradle-wrapper.jar

2.96 KB
Binary file not shown.
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
54
zipStoreBase=GRADLE_USER_HOME
65
zipStorePath=wrapper/dists

gradlew

+33-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
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" ;;
154172
esac
155173
fi
156174

@@ -159,14 +177,9 @@ save () {
159177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160178
echo " "
161179
}
162-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
163181

164182
# Collect all arguments for the java command, following the shell quoting and substitution rules
165183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166184

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172185
exec "$JAVACMD" "$@"

gradlew.bat

+24-19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
1329
set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
1635
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1837

1938
@rem Find java.exe
2039
if defined JAVA_HOME goto findJavaFromJavaHome
2140

2241
set JAVA_EXE=java.exe
2342
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
2544

2645
echo.
2746
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
3554
set JAVA_HOME=%JAVA_HOME:"=%
3655
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
3756

38-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
3958

4059
echo.
4160
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
4564

4665
goto fail
4766

48-
:init
49-
@rem Get command-line arguments, handling Windows variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
53-
:win9xME_args
54-
@rem Slurp the command line arguments.
55-
set CMD_LINE_ARGS=
56-
set _SKIP=2
57-
58-
:win9xME_args_slurp
59-
if "x%~1" == "x" goto execute
60-
61-
set CMD_LINE_ARGS=%*
62-
6367
:execute
6468
@rem Setup the command line
6569

6670
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6771

72+
6873
@rem Execute Gradle
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7075

7176
:end
7277
@rem End local scope for the variables with windows NT shell

plugin/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ publishing {
3838

3939
dependencies {
4040
compileOnly gradleApi()
41-
implementation "com.android.tools.build:gradle:3.1.2"
42-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
41+
implementation "com.android.tools.build:gradle:$agp_version"
42+
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
4343
}
4444

4545
compileKotlin {

plugin/src/main/kotlin/com/nishtahir/CargoBuildTask.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ import org.gradle.api.DefaultTask
66
import org.gradle.api.GradleException
77
import org.gradle.api.Project
88
import org.gradle.api.logging.LogLevel
9+
import org.gradle.api.tasks.Input
910
import org.gradle.api.tasks.TaskAction
1011
import java.io.ByteArrayOutputStream
1112
import java.io.File
1213

1314
open class CargoBuildTask : DefaultTask() {
15+
@Input
1416
var toolchain: Toolchain? = null
1517

16-
1718
@Suppress("unused")
1819
@TaskAction
1920
fun build() = with(project) {

plugin/src/main/kotlin/com/nishtahir/RustAndroidPlugin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ open class RustAndroidPlugin : Plugin<Project> {
194194
val default = if (apiLevel != null) {
195195
apiLevel
196196
} else {
197-
extensions[T::class].defaultConfig.minSdkVersion.apiLevel
197+
extensions[T::class].defaultConfig.minSdkVersion!!.apiLevel
198198
}
199199
cargoExtension.apiLevels = cargoExtension.targets!!.map { it to default }.toMap()
200200
}

samples/app/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
buildscript {
2+
ext.agp_version = '4.1.0'
23
repositories {
34
google()
45
maven {
56
url "https://plugins.gradle.org/m2/"
67
}
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.2'
10+
classpath "com.android.tools.build:gradle:$agp_version"
1011
classpath 'org.mozilla.rust-android-gradle:rust-android:+'
1112
}
1213
}
@@ -30,6 +31,7 @@ android {
3031
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3132
}
3233
}
34+
ndkVersion "20.1.5948944"
3335
}
3436

3537
cargo {

samples/library/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.2'
9+
classpath "com.android.tools.build:gradle:$agp_version"
1010
classpath 'org.mozilla.rust-android-gradle:rust-android:+'
1111
}
1212
}

samples/unittest/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
buildscript {
2+
ext.agp_version = '4.0.1'
23
repositories {
34
google()
45
maven {
56
url "https://plugins.gradle.org/m2/"
67
}
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.2'
10+
classpath "com.android.tools.build:gradle:${agp_version}"
1011
classpath 'org.mozilla.rust-android-gradle:rust-android:+'
1112
}
1213
}
@@ -30,6 +31,7 @@ android {
3031
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3132
}
3233
}
34+
ndkVersion "20.1.5948944"
3335
sourceSets {
3436
test.resources.srcDirs += "$buildDir/rustJniLibs/desktop"
3537
}

samples/unittest/gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
android.useAndroidX=true
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)