Skip to content

Commit 0ff445c

Browse files
authored
Merge pull request #160 from immutable/fix/android-newer-unity-versions
[DX-2622] fix: android custom tabs version, build immutable android library as aar
2 parents f2338c2 + ed3594e commit 0ff445c

26 files changed

+505
-64
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*.iml
2+
.gradle
3+
/local.properties
4+
/.idea/caches
5+
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
10+
.DS_Store
11+
/build
12+
/captures
13+
.externalNativeBuild
14+
.cxx
15+
local.properties
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
plugins {
2+
id 'com.android.library'
3+
}
4+
5+
android {
6+
namespace 'com.immutable.unity'
7+
compileSdk 33
8+
9+
defaultConfig {
10+
minSdk 22
11+
12+
consumerProguardFiles "consumer-rules.pro"
13+
}
14+
15+
buildTypes {
16+
release {
17+
minifyEnabled false
18+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
19+
}
20+
}
21+
compileOptions {
22+
sourceCompatibility JavaVersion.VERSION_1_8
23+
targetCompatibility JavaVersion.VERSION_1_8
24+
}
25+
}
26+
27+
dependencies {
28+
implementation 'androidx.browser:browser:1.5.0'
29+
}
30+
31+
assemble.doLast {
32+
copy {
33+
def aarName = 'ImmutableAndroid-release.aar'
34+
println "Copying aar to Unity SDK..."
35+
from("$projectDir/build/outputs/aar") {
36+
include aarName
37+
}
38+
into "$projectDir/../../../../src/Packages/Passport/Runtime/Assets/Plugins/Android"
39+
rename aarName, 'ImmutableAndroid.aar'
40+
println "Successfully copied aar to Unity SDK"
41+
}
42+
}

Plugins/Android/ImmutableAndroid/ImmutableAndroid/consumer-rules.pro

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
<queries>
4+
<intent>
5+
<action android:name="android.support.customtabs.action.CustomTabsService" />
6+
</intent>
7+
</queries>
8+
<application>
9+
<activity
10+
android:name="com.immutable.unity.ImmutableActivity"
11+
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
12+
android:exported="false"
13+
android:launchMode="singleTask"
14+
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
15+
</application>
16+
</manifest>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Immutable Android plugin
2+
3+
To build and use a new version:
4+
1. Run the `assemble` gradle command (A custom task will copy the generated aar to `src/Packages/Passport/Runtime/Assets/Plugins/Android` and rename it to `ImmutableAndroid.aar`)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
plugins {
3+
id 'com.android.library' version '8.2.0' apply false
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Project-wide Gradle settings.
2+
# IDE (e.g. Android Studio) users:
3+
# Gradle settings configured through the IDE *will override*
4+
# any settings specified in this file.
5+
# For more details on how to configure your build environment visit
6+
# http://www.gradle.org/docs/current/userguide/build_environment.html
7+
# Specifies the JVM arguments used for the daemon process.
8+
# The setting is particularly useful for tweaking memory settings.
9+
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
10+
# When configured, Gradle will run in incubating parallel mode.
11+
# This option should only be used with decoupled projects. More details, visit
12+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13+
# org.gradle.parallel=true
14+
# AndroidX package structure to make it clearer which packages are bundled with the
15+
# Android operating system, and which are packaged with your app's APK
16+
# https://developer.android.com/topic/libraries/support-library/androidx-rn
17+
android.useAndroidX=true
18+
# Kotlin code style for this project: "official" or "obsolete":
19+
kotlin.code.style=official
20+
# Enables namespacing of each library's R class so that its R class includes only the
21+
# resources declared in the library itself and none from the library's dependencies,
22+
# thereby reducing the size of the R class for that library
23+
android.nonTransitiveRClass=true
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists
+248
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,248 @@
1+
#!/bin/sh
2+
3+
#
4+
# Copyright © 2015-2021 the original 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+
19+
##############################################################################
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
63+
##############################################################################
64+
65+
# Attempt to set APP_HOME
66+
67+
# Resolve links: $0 may be a link
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73+
[ -h "$app_path" ]
74+
do
75+
ls=$( ls -ld "$app_path" )
76+
link=${ls#*' -> '}
77+
case $link in #(
78+
/*) app_path=$link ;; #(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
81+
done
82+
83+
# This is normally unused
84+
# shellcheck disable=SC2034
85+
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87+
88+
# Use the maximum available, or set MAX_FD != -1 to use that value.
89+
MAX_FD=maximum
90+
91+
warn () {
92+
echo "$*"
93+
} >&2
94+
95+
die () {
96+
echo
97+
echo "$*"
98+
echo
99+
exit 1
100+
} >&2
101+
102+
# OS specific support (must be 'true' or 'false').
103+
cygwin=false
104+
msys=false
105+
darwin=false
106+
nonstop=false
107+
case "$( uname )" in #(
108+
CYGWIN* ) cygwin=true ;; #(
109+
Darwin* ) darwin=true ;; #(
110+
MSYS* | MINGW* ) msys=true ;; #(
111+
NONSTOP* ) nonstop=true ;;
112+
esac
113+
114+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
115+
116+
117+
# Determine the Java command to use to start the JVM.
118+
if [ -n "$JAVA_HOME" ] ; then
119+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
120+
# IBM's JDK on AIX uses strange locations for the executables
121+
JAVACMD=$JAVA_HOME/jre/sh/java
122+
else
123+
JAVACMD=$JAVA_HOME/bin/java
124+
fi
125+
if [ ! -x "$JAVACMD" ] ; then
126+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
127+
128+
Please set the JAVA_HOME variable in your environment to match the
129+
location of your Java installation."
130+
fi
131+
else
132+
JAVACMD=java
133+
if ! command -v java >/dev/null 2>&1
134+
then
135+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136+
137+
Please set the JAVA_HOME variable in your environment to match the
138+
location of your Java installation."
139+
fi
140+
fi
141+
142+
# Increase the maximum file descriptors if we can.
143+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144+
case $MAX_FD in #(
145+
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
148+
MAX_FD=$( ulimit -H -n ) ||
149+
warn "Could not query maximum file descriptor limit"
150+
esac
151+
case $MAX_FD in #(
152+
'' | soft) :;; #(
153+
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
156+
ulimit -n "$MAX_FD" ||
157+
warn "Could not set maximum file descriptor limit to $MAX_FD"
158+
esac
159+
fi
160+
161+
# Collect all arguments for the java command, stacking in reverse order:
162+
# * args from the command line
163+
# * the main class name
164+
# * -classpath
165+
# * -D...appname settings
166+
# * --module-path (only if needed)
167+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
168+
169+
# For Cygwin or MSYS, switch paths to Windows format before running java
170+
if "$cygwin" || "$msys" ; then
171+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
172+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
173+
174+
JAVACMD=$( cygpath --unix "$JAVACMD" )
175+
176+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
177+
for arg do
178+
if
179+
case $arg in #(
180+
-*) false ;; # don't mess with options #(
181+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
182+
[ -e "$t" ] ;; #(
183+
*) false ;;
184+
esac
185+
then
186+
arg=$( cygpath --path --ignore --mixed "$arg" )
187+
fi
188+
# Roll the args list around exactly as many times as the number of
189+
# args, so each arg winds up back in the position where it started, but
190+
# possibly modified.
191+
#
192+
# NB: a `for` loop captures its iteration list before it begins, so
193+
# changing the positional parameters here affects neither the number of
194+
# iterations, nor the values presented in `arg`.
195+
shift # remove old arg
196+
set -- "$@" "$arg" # push replacement arg
197+
done
198+
fi
199+
200+
201+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203+
204+
# Collect all arguments for the java command;
205+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206+
# shell script including quotes and variable substitutions, so put them in
207+
# double quotes to make sure that they get re-expanded; and
208+
# * put everything else in single quotes, so that it's not re-expanded.
209+
210+
set -- \
211+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
212+
-classpath "$CLASSPATH" \
213+
org.gradle.wrapper.GradleWrapperMain \
214+
"$@"
215+
216+
# Stop when "xargs" is not available.
217+
if ! command -v xargs >/dev/null 2>&1
218+
then
219+
die "xargs is not available"
220+
fi
221+
222+
# Use "xargs" to parse quoted args.
223+
#
224+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
225+
#
226+
# In Bash we could simply go:
227+
#
228+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
229+
# set -- "${ARGS[@]}" "$@"
230+
#
231+
# but POSIX shell has neither arrays nor command substitution, so instead we
232+
# post-process each arg (as a line of input to sed) to backslash-escape any
233+
# character that might be a shell metacharacter, then use eval to reverse
234+
# that process (while maintaining the separation between arguments), and wrap
235+
# the whole thing up as a single "set" statement.
236+
#
237+
# This will of course break if any of these variables contains a newline or
238+
# an unmatched quote.
239+
#
240+
241+
eval "set -- $(
242+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
243+
xargs -n1 |
244+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
245+
tr '\n' ' '
246+
)" '"$@"'
247+
248+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)