diff --git a/Plugins/Android/ImmutableAndroid/.gitignore b/Plugins/Android/ImmutableAndroid/.gitignore new file mode 100644 index 00000000..aa724b77 --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/Plugins/Android/ImmutableAndroid/ImmutableAndroid/.gitignore b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/Plugins/Android/ImmutableAndroid/ImmutableAndroid/build.gradle b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/build.gradle new file mode 100644 index 00000000..810f0b4d --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/build.gradle @@ -0,0 +1,42 @@ +plugins { + id 'com.android.library' +} + +android { + namespace 'com.immutable.unity' + compileSdk 33 + + defaultConfig { + minSdk 22 + + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + implementation 'androidx.browser:browser:1.5.0' +} + +assemble.doLast { + copy { + def aarName = 'ImmutableAndroid-release.aar' + println "Copying aar to Unity SDK..." + from("$projectDir/build/outputs/aar") { + include aarName + } + into "$projectDir/../../../../src/Packages/Passport/Runtime/Assets/Plugins/Android" + rename aarName, 'ImmutableAndroid.aar' + println "Successfully copied aar to Unity SDK" + } +} \ No newline at end of file diff --git a/Plugins/Android/ImmutableAndroid/ImmutableAndroid/consumer-rules.pro b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/Plugins/Android/ImmutableAndroid/ImmutableAndroid/proguard-rules.pro b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/AndroidManifest.xml b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/AndroidManifest.xml new file mode 100644 index 00000000..acda7b83 --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/AndroidManifest.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/java/com/immutable/unity/CustomTabsController.java b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/java/com/immutable/unity/CustomTabsController.java similarity index 100% rename from src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/java/com/immutable/unity/CustomTabsController.java rename to Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/java/com/immutable/unity/CustomTabsController.java diff --git a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/java/com/immutable/unity/ImmutableActivity.java b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/java/com/immutable/unity/ImmutableActivity.java similarity index 100% rename from src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/java/com/immutable/unity/ImmutableActivity.java rename to Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/java/com/immutable/unity/ImmutableActivity.java diff --git a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/java/com/immutable/unity/RedirectActivity.java b/Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/java/com/immutable/unity/RedirectActivity.java similarity index 100% rename from src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/java/com/immutable/unity/RedirectActivity.java rename to Plugins/Android/ImmutableAndroid/ImmutableAndroid/src/main/java/com/immutable/unity/RedirectActivity.java diff --git a/Plugins/Android/ImmutableAndroid/README.md b/Plugins/Android/ImmutableAndroid/README.md new file mode 100644 index 00000000..a549ffb2 --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/README.md @@ -0,0 +1,4 @@ +# Immutable Android plugin + +To build and use a new version: +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`) diff --git a/Plugins/Android/ImmutableAndroid/build.gradle b/Plugins/Android/ImmutableAndroid/build.gradle new file mode 100644 index 00000000..c0ddfd43 --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/build.gradle @@ -0,0 +1,4 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.library' version '8.2.0' apply false +} \ No newline at end of file diff --git a/Plugins/Android/ImmutableAndroid/gradle.properties b/Plugins/Android/ImmutableAndroid/gradle.properties new file mode 100644 index 00000000..3c5031eb --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/Plugins/Android/ImmutableAndroid/gradle/wrapper/gradle-wrapper.jar b/Plugins/Android/ImmutableAndroid/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..033e24c4 Binary files /dev/null and b/Plugins/Android/ImmutableAndroid/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Plugins/Android/ImmutableAndroid/gradle/wrapper/gradle-wrapper.properties b/Plugins/Android/ImmutableAndroid/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..62f495df --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/Plugins/Android/ImmutableAndroid/gradlew b/Plugins/Android/ImmutableAndroid/gradlew new file mode 100755 index 00000000..fcb6fca1 --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Plugins/Android/ImmutableAndroid/gradlew.bat b/Plugins/Android/ImmutableAndroid/gradlew.bat new file mode 100644 index 00000000..6689b85b --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Plugins/Android/ImmutableAndroid/settings.gradle b/Plugins/Android/ImmutableAndroid/settings.gradle new file mode 100644 index 00000000..2362ab93 --- /dev/null +++ b/Plugins/Android/ImmutableAndroid/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +include ':ImmutableAndroid' \ No newline at end of file diff --git a/sample/Assets/Plugins/Android/AndroidManifest.xml b/sample/Assets/Plugins/Android/AndroidManifest.xml index 84257e26..63b9c001 100644 --- a/sample/Assets/Plugins/Android/AndroidManifest.xml +++ b/sample/Assets/Plugins/Android/AndroidManifest.xml @@ -3,13 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" xmlns:tools="http://schemas.android.com/tools"> - - - - - - - @@ -19,12 +12,6 @@ - diff --git a/sample/Assets/Plugins/Android/mainTemplate.gradle b/sample/Assets/Plugins/Android/mainTemplate.gradle index e4fa75d8..758caf60 100644 --- a/sample/Assets/Plugins/Android/mainTemplate.gradle +++ b/sample/Assets/Plugins/Android/mainTemplate.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation('androidx.browser:browser:1.7.0') + implementation('androidx.browser:browser:1.5.0') **DEPS**} android { diff --git a/sample/Packages/packages-lock.json b/sample/Packages/packages-lock.json index a93d199a..0390c3ea 100644 --- a/sample/Packages/packages-lock.json +++ b/sample/Packages/packages-lock.json @@ -8,7 +8,7 @@ "url": "https://package.openupm.com" }, "com.immutable.passport": { - "version": "file:/Users/natalie/Downloads/Passport", + "version": "file:../../src/Packages/Passport", "depth": 0, "source": "local", "dependencies": { diff --git a/src/Packages/Passport/CHANGELOG.md.meta b/src/Packages/Passport/CHANGELOG.md.meta new file mode 100644 index 00000000..34b7ddd3 --- /dev/null +++ b/src/Packages/Passport/CHANGELOG.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3abe1372374da42279b4a4c1dc1d173d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/build.gradle b/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/build.gradle deleted file mode 100644 index b051824a..00000000 --- a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -apply plugin: 'com.android.library' - -dependencies { - implementation('androidx.browser:browser:1.7.0') -} - -android { - compileSdkVersion 33 - buildToolsVersion '30.0.3' - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - minSdkVersion 22 - targetSdkVersion 33 - versionCode 1 - versionName '1.0' - consumerProguardFiles 'proguard-immutable.txt' - } -} diff --git a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/proguard-immutable.txt b/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/proguard-immutable.txt deleted file mode 100644 index 80558d8f..00000000 --- a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/proguard-immutable.txt +++ /dev/null @@ -1,8 +0,0 @@ --dontwarn com.immutable.unity --keep class com.immutable.** { *; } --keep interface com.immutable.** { *; } --keep public class com.immutable.unity.ImmutableAndroid { public protected *; } - --dontwarn androidx.** --keep class androidx.** { *; } --keep interface androidx.** { *; } \ No newline at end of file diff --git a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/AndroidManifest.xml b/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/AndroidManifest.xml deleted file mode 100644 index f02b3c1f..00000000 --- a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/src/main/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Packages/Passport/Runtime/Assets/Plugins/Android/ImmutableAndroid.aar b/src/Packages/Passport/Runtime/Assets/Plugins/Android/ImmutableAndroid.aar new file mode 100644 index 00000000..4e3e1f1f Binary files /dev/null and b/src/Packages/Passport/Runtime/Assets/Plugins/Android/ImmutableAndroid.aar differ diff --git a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib.meta b/src/Packages/Passport/Runtime/Assets/Plugins/Android/ImmutableAndroid.aar.meta similarity index 80% rename from src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib.meta rename to src/Packages/Passport/Runtime/Assets/Plugins/Android/ImmutableAndroid.aar.meta index 5ed1faff..e6413995 100644 --- a/src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib.meta +++ b/src/Packages/Passport/Runtime/Assets/Plugins/Android/ImmutableAndroid.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fdcd7aa1984da404d890f63f81d0a65b +guid: 2df21f61a9f954db1821ed44d1af7df9 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -12,10 +12,15 @@ PluginImporter: validateReferences: 1 platformData: - first: - Any: + Android: Android second: enabled: 1 settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} - first: Editor: Editor second: