F0Bu(7L9UUtSa~E`E
z;s$Pi%J7IG-S_rpdtcaXhUx!f)F#!Dr8g=;FJ1&0>40V#X@|xH<>U@@LMdB;Ml-eqt8i5@4B6x;LXnLi6iyKWHxb!jNZ6t*O5+rjpD50s
zKr5C`5dG4_WT*sK2^w2Kf-Pc_SqhmAWSGW(EkMmAoT-^?HbOso@?n`5G|GFa;#X+D
zp=+O@MUUx1biiw6z-uZ5-=%*Hk>qohp1?h-8t|-;7bDxT+@*c1Q&e=Pt2Ad_Kv7LzWk4u4q*d{oudKPR)i$?(_$0fx;{
z31lVg%LJhz1PO+Kgr$MHyd*El$SiT@4J6Xqiq^fgt+g%I-L`bGt*9hms%W*iTWfc%
z*jj5_>(*6mRlfhZZ)P${9s>S8NbY^_E@%CpbI-eZ{DXV%C!#t0uAg@DSZNBS87Iwn
zX(r^O34cg4QC=tcse~tMJjF%)iwFGV=czJxk~Bd-pUkI7bE==Gagm>{=jqbS(74!7
zW4T1umug(*<8nXU%@rEY^wUJH^wT{&OGakP(;Ru4tMNQP1$nZc=ko$T)$l@jT_nw7
zX+p#3AXoW#iN>eN^in^4l9$Qg$9!BZ{c=Co@P7&)*UHRFk^Xd9xXMrCxz5L{r9VUC
zdOt1XH5xbgX))MgaIG}!q&ZXQte35gKHeZB8#Ugf@n#=?+{aBau*FZyd8;&^@Y4%?
zmd0mme2zSx>!&l=@Y8B;*0{w_YlZr1ZuPM#FKyC+6;n(DN$Zbf=txO5s;M>Rx@Hb;c=DNY;K<*vb|iGOBS
zOC*&HZ#P$lBW86=iO}6O+3p
z-fA+9tPjV`hE%lKOl&YPDISQo7?DjzA}sIeLATWrhUX?ba<+X9>HRGU)3D4H;iSd1
z*inPcb`OWPh1*jJ!wSb^RVB95!+-Hgv5B~%C3l{wtWMn7gF0!flnzONTtLndKltz9kA7$YJY1JSmteA
z&gAMayD%PxZ`%~ZyeNWXicKJCwxkkatGjXy&wm_|T
zvcVAG<+qvFlF
zn%OMxQWCm_I5u36$(rMb3X)E*bDT*nDLb0z5}sey_&PwnCEnSclj)dd_FE=513D{Y
zLltIsDKNSs;sU>+Tr+LftXWL$jz?wYT>bw{c6nX1q?s+voPH_hi4@KUc18+EF4;OO
zLukGbT5{rqa)0Zv46OynrghA0m7%pzXjPmDtu6hV7s=)`k7M(RX6n4Ix&2%g3zw=B
zMnY~l4oj1oJ?n(k#cqG2Iw8`rnqD_kmg)2qJ+0GU=~bN`pa*sO1HGivA$mlo&(ftj
zT}+qg)Jywyx{AL7#wS$u%BHXCbOl|h(`9tI#$VHUH-BHR^Vj(Xjc=5fn{>XJZ_)Wy
zz6CYthoF775W7w1+xZ(%Ay-2riN;mc6)2o^{w9A5nId;KCx}4-y7C_Ww$9(-@9O+L
z{)*0b@b{6hoXZ%Ef1vXZ`A(hp@?ARL&G$&NPv;)KLFZn2k?GvimAt{+QX@E{C^;k8
z8aI={Sby9KqT;oTa4cxVy0I*Q<2f!laAvSJeO3ppc(4s8LD1~Nu^#CT&d#puo{1`@
zU%0i+=V4gq{d_>@d$~{NAMssGXB}0DH18x>#Dmd~CV|fP@%2w?2uJgnE6P*viq};Jd%73PCi^}4`c$?GKV4DHwww_!RD~dG%
z+>UFaMt88o*lq@!O*0m>jA*A65y2f{t7B$SOnqG>qCu;}u+W&n8IIo$GlHFoI5t|{
zLFmyfyljY8q#-&pJr9EhrGg5ElTbS$)`QDiWlPXVK(uro1iBQv^!8v|A|8c(tVAj)
zo`0~5xtXF^Ft)_nb7$Wz5(@7
zKfczdVpce6X6qOUx<^q}^k?7dM8fEn6s+@O^rFs>^AkEhDNj$qfpl16!rvT@rQ=u#
zJdG;iXcgE1bZ5RQJS`p3I7%kh!uj)c{(mWA4OE`d`DgsB&OaBxk8`dJnF0=nw>_ux
zFZh>2=vUJGdVo^d%2DUvh(+9DPl>YMW|j@C0Cj#&mQDTeB2eS!b^aZ{pz~qLo#Th*
zn6wE>YvQR$tBM?y$%w&BogD1!FO-9A@kA&n`R7HAf3Nc%btIWvZeQRA0%{(mFC
ztnr_8eue+6^I!O{nBHO6mpZ@7f7AIjejO#PV;QB>Tl|L3Z;B(|;=gAsJfwEg`5%(I
z|Ecr8_+_2{E$*H?*codF6oV6T({b*U_~Ad|mbZ0!m;S5sJN#Xs@#u#D(~RS+hfscJ
zrX{FRZ_YXKkNS-7mCLeTWt#LMAAi!hc*!j*b0}@-NW^#8pOGU5RyC;ghs4PMhviha
zOkW({
zo%E6JW(o$0t-hh)jL_^~c~O>@adF4zWI?YNb5t|Yxi`b)3c@taNI0)MA0z=#h(
ztFi{d3AhGa7};e56dVQxl?JgEXgJ&98lvPF*FI-TJv8_Wb>?nS=cAqV^`)Q719shTp
zI~l$J)^)*?LoAl{vs2hFkH;;9fYG@I1zDqIBrNg3NGbd3jZ_T9L1MLmk*UtNJN;3T
z)n`un+j7wI4E#*SQz6Y_hQ+0DP9!XiI#QUHvxqtCucG(#}UoO8^
z+E-em0l^_^gp(^WH7@LFv;tA59{c_gEJi_?8Y32up+=3^(u^y1xOh>~kQ7UcxVet%
zzh%;P7-0+b2Mz-jn>m?$d`^NIcpE#x`I18Tjp?6C-k%uqyktP`}
zXF*Mek!VDOm`K(t8r%_8Bot=BJdjSHIM-rT+vq!j2RIr4I3kJWj88mw3(Sg(ca~aZnJON1O2cZa)VZxYp4Mi
zbw|U$X9vzElTN0cR6;}^3eczNGsJWe-tuS{70AT}o(tp_L-m)@<*L7eu0%fuYpJ~5Q)rozbCu04E9X-BGF=CWWc^p@tDxeCR$qgaT-aMmyXgjK
zHVJy(NH<~CDKwdG#*>$B!EQHp-ikf=rnmLsyD{d&%yk75_ETU@A5Cm3>!nEzt_AMV
zqv%JzkbkGpop&=$t_XN~Xz~Jgq5GyIZGTcyCX5pR
z&2P~jn6eYk--e+z+5!-L2eab3>$0x7j=l>+BdkE>dvu4A{Zjfq{QxpI(CPF;P;rC%
zQh&OW_JZDB*fWo`BOvS5Xs1TwHM(1)dsw4=gm12?D>drzeL$n}u2GQRqv;yeyi3Ce
zxUv_Jv;*Y`XnI8cQh3nQP;r1}Fz_(8pxAvMl{C4^8~0P`ek!{YGv&xvH)E<|@RaKS
z&CDY}RM5PiDj&h3S%VhI#Oynj4C0IFlz)%*TIl^{XnY+70n1WAvWmVAt#6>Ufa19T
z;WbKMC1KWPZ3?EWo({mad7yGG-AjG2+3B$Sk1*?|`!KI7%gWsSm=oKLB-eWs)ac;E
z_h=fdMC|Mkuc3!kVw5Kd(meI_6BW#Nsnp5;1HoK(AEHOn8XiF}k-NH&
z79-X|l8mZ$(-L$`8ld&u3UT563xDhoEcDz)CrkLvu|w~)-K3WXv;(v>kL-{;Tt3*P
z2SEQ`m>DSyj+g*9%!ct7(?Q5|AHwP3tV?IpXa#-^E9cRp^cWO?WLZU5r`_zsPH}Et
z)}{8y{TLC2%gA*EsY}a*!$FN6#}C6qQw83x>;x7+p_1s6_ovM0Q&cU>PyO_oq+3Rnh9#psE{iHy=TF#gMX&b&jC&!IIRcm
zUji*5I)i=%`W{gB(r>`Q4Z1p>o>O3dD2suIR4}6kM*4eRfxQr^@poCU*OJe71blrN
zALFM+qvaaCpwVg#X@uURsTdO=xN{egEZT@An}-KM_Au13GvXO|lb9M)VC<*nyQrmy
zTI2=dw{md5n{?ygrRm+665%$atVsq
zeu_iAkXK$hkxwKh&IkG*@1q1lC)pJ6_L9|0sgPEx>WA$Ct(SI4Y;^6R;US-T3iuB0
zIr3F-?3OYjUw<9~`AE8M;Jl4ukShj6N}rDdei!;(sML04bJcp}9HReW_I>0koTf+?
zMVv
zaLQ}2&q9;2I6wB5=>&70$2D8vSbeM}PWAyPE!~aGsCi<6rb|xG9tM
z?4AF?PH{~&X%HRprP15((;|(c!1WO@&kY5cv}ZJWhfpK*yhHi_r94$6WRHlAVD~Ql
zH+@9hh%td_(P%eHxrQ>>c5>4K_t$Aed4($AF4%MAb%1dy5>HqEF{f%$E+j8cpwS$l
z$vhe5$A1)>##3_+@uIB8MX>%4l*UB}(Kpp0ZWm218i8~9eN{-^rF74GPl}y=?@=N5
z3q8t5AHZ{VY}I0yoE}E1A-W*D2Ab+o_$((oF3CEkcS&VI{ARC10DAr
zCrD=);BF&g9SkmT^})FK9C7V+q-1{_`LdLJpk&u6K3LbTQ+x;?N!=MI-U>b=cx0N-
zKquxov-xl*3Y#2+@F>KlgE82d_EC&Md5CVT=P~#|5Tv{C!LSn_41SeG^bn^v~a4
zzX4zc_CgSbCjvYTz_TEX!iE5w0obC;=QLz#*cRXg%{w&g(vTA%FF=8SSko-q)T%9i
zTQhV5qos4@vm)!NEgzMOn*<`A^4K%G!FR
z)g&N%(Jovkx^jC*@x)8R{B)=_RikASAVmWHElt<#EP=sv=9qvlXVg#>E@`^D-)dG>
z^H8Za93bOVX&fu2MxVV+pM9oT1TrOm!>r47Q(c^SIMm-B#|K#>>kOl@Z;hRdiXr?XSmvWM(xipsu|T}-ybFL!>Pdw=(K&-ah>`JVH7&ht6v
zuXCRBKJQ`}>Tn1pD~mFFxV4m(i}|u9W0o8K^W0pc`*Kr-$O}>xH%HxQk!xd9Om#O{
z>L85MJa8(A`%UnNK7VhykK-*G!|$f}Tpp+v$=}zjUW7?1{Zo
zcDhhJ3xTKhfmEx1Vk_d6ea(Pb!1a8ZOw6pYQ~I3<2AsUEZOTQ%2S4MTijA`xp6)!b
zobF3ylF(1qI$ZqPJ`u^F@PspM(IB?bNh*#mBC(Y3S4gdnfrfPy7mEW*wQF!G4%uRN
z0mj~KrxnGZqiZm<)OB)PE422(hqYvRt(YZfyNP*0U#1NZ(D@Zm7<9kmy`dbT8IDTHA1X;m^UD5>A{&9-fo`s<8v7v01x&i=PD14(7J?2)Oz!qDTnt@!scSlnz+8bAQg
zu64qoLhuRV4RfgyZp8bXcUIsm!0(W73ZKUlc4<1jM;Kd_CUnRn0x)eFWZEJggZU}JukgeUej<&@&S@wr>nhFmocKl5OTSWt^iUkw_xlcP;O_<-xjYD6?Nz{snZ~
zQz*9x!TPMcW$UPQ>!_%9E9~M1=^h>OWb`oppmnBc=3oH9H#T(Av)bh+CKrM{@6>;r7WVMw;p7;NCfY@`JMlD^+MuWotk?)p#5MCAjPaqXlbOSQ74+2mQJV4Is#iHPDYs{zrNfAc
zgsk&Wc}#DPlR>>;;{bcY*UkO*-=g%Q-k>snC`#;^DN0ao!OStQ&?BFE2vVcyFX-T&
zABL}C09*F^+GI+PYwAf58zMJ7E0f7?;Os=Q<^7ZTdm%rd$cq+Z^+QClW|Uo8WMx
zG4RxtrtilIFRWwIv2tGdZsP^nDeJ?dvLC7gFvw15j^%=*SN?Nm(+(d&u^RQ48jL%7
zq1zu#K&>S=!Xb6#OQK`&n8{_jNA3&NE1us{4p&PXflZbA4oP3tmr2}iD1pyR=|to5
zF?wi&w4vLzw;m+qz`46ugph9wHEe8?asmw)zB{88)%6YaExoM*-z0wI^ymX45C!#S
zm{&WJ{Z6#82~~?2ZczG4xg+Bs(?gerNt=obds;wMGMZ!4{Fl)YHRhfvSvT}4@58>O
z-&(`U;(PXd2!nbRUBqmnf~k1*?$Gg2?<>RiWp4VrEhsCgS49Ym7LmzrR4Dkao!i|)
zl0Uw%a6Wy-d@zn5*s@}#(BA0IV?u^uLSIHW2z?Wh;c-SAd-|L5gNMTzKl=2a3HOoe?`
z82K#d7doV`E~1_*3L<%u!XeBd!qv!`25D>AUZ}4i4{1`nkyd{uH05TgH~dL9dQ(
z=^x$}QH0B-d^zL3VvqmgdD1<<`S}{~=cOv~w|K+qr6sA#lE_lz=L6+RVpC4!8;i?2{n@yJPsMzCBzD4L%h{Ou@Fp&oL5(B~z8b-Chmhpe
z`?2Uup5eaU#_IV{1+}PkcS9{nwcH(ARL=;HnoV`xXNOq1lp)UQ;$HlH4i#g11OHFT
zx?(U?>)Aunl9l*~PS}jt0K1WkQDA3>-^}=8ni6?p-bU>HW~hJ!(Q|vf<>4FnYVw=t
z0Iyc>49my;dD|g9mtW#AtqmhL#*xlmVOh~pE468a3Ww}`rWf^TzxhApUVY4DRRw-o
zGpHp~$7{3>4<-J$NJ*cv3dDme5JbYcOrgf0mnlx;K58$$EMZ5AZz1PS3^9@>D
z$84GM2$D3dytG(8gr|TFv@gEmeHL9xU{BNZapi@5PI%5#@3k9%;Yqbu4ZFF_h8N56
zP(Yo5#7Mh79p%zGaA;?CkLf_nDhz;2;tQ{7ywsbbJQR{jHIZ@r@|mHNQ6%D4*>*3Y
z-g$$q*;IgsiBvqQw8j`LOLf-=!t%P)H_Cy$;EKg5$86ieeW`csd!8u9
z6+x9^-GbFw%`D_GaVbz~|9#MvkaBzP*TkS)Vh}s}f?{;+%MW6tC9%lYAI6%#j5Qf;
z$OP=?k*2HN5?tnEURUYYJ2xz3TyAncRJxTF8s+(HRtO@5<0E)#(u7qCo}E}>-9rq#
zOJ4kSZoV;NzLhD}0rqVe#)XBYby{uos6aYvqkPqJ%X;2n>f?Vu^5!C8+56wQb`!~v
zxivGMZa*po2YRG^cePc9f;A!}%+?e
znN{YLUPt0JOetV9p8X)$1ee*#ujAS=7Z0`GJCkHl@4##Bo!wp{q+p{K=OKBqA{Diw
zEdn%vF31Mn^to6uC}KAECQE8ZUAS5-)}_k%3B0OK6`$6j^2;WK2f_OMz3vSU!&_!1
z-=mYNb1Y?|%khp;(3hF6)&>qz5k!9W+zIU
z&mkbp1rB{_wFp3QbmE{yDUqO_>(7o$y
zE+XWOL#0xVw4nO5OB|PWM!M$9C8{ELdl^09rc|M&^z{`C*5+p_L}t0`+m38z>0ND269%(-HKYDlfZ5Su?c0UeSO*UX1_@>iVtaE$d;kSL=qd2|1LVx%y!m?
z+i7)5=WP#XPFrgjjtYN3?=iUc
zND%u6maT@{cNvV!=j{-~3YwBA|p*$mbR3->U%mL!|Q$_V+}$iYcHGHSOEe
zd/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ 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.
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
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
diff --git a/android/gradlew.bat b/android/gradlew.bat
index 93e3f59f..6689b85b 100644
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@@ -1,92 +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
+@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/android/settings.gradle b/android/settings.gradle
index 80f8a1a7..1e5b8431 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,4 +1,2 @@
-rootProject.name = 'capacitor-oauth2'
-
include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
\ No newline at end of file
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 13a9981e..a2f47b60 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-
+
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/ConfigUtils.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/ConfigUtils.java
similarity index 98%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/ConfigUtils.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/ConfigUtils.java
index fca1fc16..f14b9680 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/ConfigUtils.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/ConfigUtils.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import com.getcapacitor.JSObject;
@@ -10,9 +10,6 @@
import java.util.Map;
import java.util.Random;
-/**
- * @author m.oberwasserlechner@byteowls.com
- */
public abstract class ConfigUtils {
public static String getParamString(JSObject data, String key) {
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2ClientPlugin.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/GenericOAuth2Plugin.java
similarity index 98%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2ClientPlugin.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/GenericOAuth2Plugin.java
index 59fbaf80..4e3eb068 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2ClientPlugin.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/GenericOAuth2Plugin.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import android.app.Activity;
import android.content.ActivityNotFoundException;
@@ -9,15 +9,14 @@
import androidx.activity.result.ActivityResult;
-import com.byteowls.capacitor.oauth2.handler.AccessTokenCallback;
-import com.byteowls.capacitor.oauth2.handler.OAuth2CustomHandler;
+import com.getcapacitor.community.genericoauth2.handler.AccessTokenCallback;
+import com.getcapacitor.community.genericoauth2.handler.OAuth2CustomHandler;
import com.getcapacitor.JSObject;
import com.getcapacitor.Plugin;
import com.getcapacitor.PluginCall;
import com.getcapacitor.PluginMethod;
import com.getcapacitor.annotation.ActivityCallback;
import com.getcapacitor.annotation.CapacitorPlugin;
-
import net.openid.appauth.AuthState;
import net.openid.appauth.AuthorizationException;
import net.openid.appauth.AuthorizationRequest;
@@ -34,8 +33,8 @@
import java.util.Map;
-@CapacitorPlugin(name = "OAuth2Client")
-public class OAuth2ClientPlugin extends Plugin {
+@CapacitorPlugin(name = "GenericOAuth2")
+public class GenericOAuth2Plugin extends Plugin {
private static final String PARAM_APP_ID = "appId";
private static final String PARAM_AUTHORIZATION_BASE_URL = "authorizationBaseUrl";
@@ -94,7 +93,7 @@ public class OAuth2ClientPlugin extends Plugin {
private AuthState authState;
private String callbackId;
- public OAuth2ClientPlugin() {
+ public GenericOAuth2Plugin() {
}
@PluginMethod()
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Options.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2Options.java
similarity index 98%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Options.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2Options.java
index f847c57a..02badc2a 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Options.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2Options.java
@@ -1,11 +1,8 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import java.util.HashMap;
import java.util.Map;
-/**
- * @author m.oberwasserlechner@byteowls.com
- */
public class OAuth2Options {
// required
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2RefreshTokenOptions.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2RefreshTokenOptions.java
similarity index 94%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2RefreshTokenOptions.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2RefreshTokenOptions.java
index aabc35c2..71040e2d 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2RefreshTokenOptions.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2RefreshTokenOptions.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
public class OAuth2RefreshTokenOptions {
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Utils.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2Utils.java
similarity index 93%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Utils.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2Utils.java
index 34651f64..9b14e6f2 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Utils.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/OAuth2Utils.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import com.getcapacitor.JSObject;
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/ResourceCallResult.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/ResourceCallResult.java
similarity index 87%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/ResourceCallResult.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/ResourceCallResult.java
index b0b62aed..524f0545 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/ResourceCallResult.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/ResourceCallResult.java
@@ -1,10 +1,7 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import com.getcapacitor.JSObject;
-/**
- * @author m.oberwasserlechner@byteowls.com
- */
public class ResourceCallResult {
private boolean error;
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/ResourceUrlAsyncTask.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/ResourceUrlAsyncTask.java
similarity index 98%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/ResourceUrlAsyncTask.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/ResourceUrlAsyncTask.java
index 9228eaf3..4e0c992f 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/ResourceUrlAsyncTask.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/ResourceUrlAsyncTask.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import android.os.AsyncTask;
import android.util.Log;
@@ -19,9 +19,6 @@
import java.net.URL;
import java.util.Map;
-/**
- * @author m.oberwasserlechner@byteowls.com
- */
public class ResourceUrlAsyncTask extends AsyncTask {
private static final String ERR_GENERAL = "ERR_GENERAL";
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/handler/AccessTokenCallback.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/handler/AccessTokenCallback.java
similarity index 70%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/handler/AccessTokenCallback.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/handler/AccessTokenCallback.java
index 3bad9043..4ffe86eb 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/handler/AccessTokenCallback.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/handler/AccessTokenCallback.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2.handler;
+package com.getcapacitor.community.genericoauth2.handler;
public interface AccessTokenCallback {
diff --git a/android/src/main/java/com/byteowls/capacitor/oauth2/handler/OAuth2CustomHandler.java b/android/src/main/java/com/getcapacitor/community/genericoauth2/handler/OAuth2CustomHandler.java
similarity index 73%
rename from android/src/main/java/com/byteowls/capacitor/oauth2/handler/OAuth2CustomHandler.java
rename to android/src/main/java/com/getcapacitor/community/genericoauth2/handler/OAuth2CustomHandler.java
index c7c3a3e4..1bb48d0e 100644
--- a/android/src/main/java/com/byteowls/capacitor/oauth2/handler/OAuth2CustomHandler.java
+++ b/android/src/main/java/com/getcapacitor/community/genericoauth2/handler/OAuth2CustomHandler.java
@@ -1,11 +1,8 @@
-package com.byteowls.capacitor.oauth2.handler;
+package com.getcapacitor.community.genericoauth2.handler;
import android.app.Activity;
import com.getcapacitor.PluginCall;
-/**
- * @author m.oberwasserlechner@byteowls.com
- */
public interface OAuth2CustomHandler {
void getAccessToken(Activity activity, PluginCall pluginCall, final AccessTokenCallback callback);
diff --git a/android/src/main/res/.gitkeep b/android/src/main/res/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
deleted file mode 100644
index 045e125f..00000000
--- a/android/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
deleted file mode 100644
index 85420055..00000000
--- a/android/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
deleted file mode 100644
index f11f7450..00000000
--- a/android/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/android/src/test/java/com/byteowls/capacitor/oauth2/ConfigUtilsTest.java b/android/src/test/java/com/getcapacitor/community/genericoauth2/ConfigUtilsTest.java
similarity index 99%
rename from android/src/test/java/com/byteowls/capacitor/oauth2/ConfigUtilsTest.java
rename to android/src/test/java/com/getcapacitor/community/genericoauth2/ConfigUtilsTest.java
index 7d373f2c..f845d5e5 100644
--- a/android/src/test/java/com/byteowls/capacitor/oauth2/ConfigUtilsTest.java
+++ b/android/src/test/java/com/getcapacitor/community/genericoauth2/ConfigUtilsTest.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import android.util.Log;
diff --git a/android/src/test/java/com/byteowls/capacitor/oauth2/OAuth2ClientPluginTest.java b/android/src/test/java/com/getcapacitor/community/genericoauth2/GenericOAuth2PluginTest.java
similarity index 97%
rename from android/src/test/java/com/byteowls/capacitor/oauth2/OAuth2ClientPluginTest.java
rename to android/src/test/java/com/getcapacitor/community/genericoauth2/GenericOAuth2PluginTest.java
index 93db6bb0..6059458c 100644
--- a/android/src/test/java/com/byteowls/capacitor/oauth2/OAuth2ClientPluginTest.java
+++ b/android/src/test/java/com/getcapacitor/community/genericoauth2/GenericOAuth2PluginTest.java
@@ -1,4 +1,4 @@
-package com.byteowls.capacitor.oauth2;
+package com.getcapacitor.community.genericoauth2;
import android.util.Log;
@@ -8,14 +8,14 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class OAuth2ClientPluginTest {
+public class GenericOAuth2PluginTest {
public static final String CLIENT_ID_ANDROID = "CLIENT_ID_ANDROID";
- private OAuth2ClientPlugin plugin;
+ private GenericOAuth2Plugin plugin;
@BeforeEach
public void setup() {
- plugin = new OAuth2ClientPlugin();
+ plugin = new GenericOAuth2Plugin();
}
@Test
diff --git a/ios/ByteowlsCapacitorOauth2/.gitignore b/ios/ByteowlsCapacitorOauth2/.gitignore
deleted file mode 100644
index f0c91c01..00000000
--- a/ios/ByteowlsCapacitorOauth2/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Pods/
-.DS_Store
-*.xcworkspace
-Podfile.lock
diff --git a/ios/ByteowlsCapacitorOauth2/.npmignore b/ios/ByteowlsCapacitorOauth2/.npmignore
deleted file mode 100644
index 0ce2733c..00000000
--- a/ios/ByteowlsCapacitorOauth2/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-ByteowlsCapacitorOauth2.xcodeproj
-Pods
-*.xcworkspace
-Podfile.lock
diff --git a/ios/ByteowlsCapacitorOauth2/ByteowlsCapacitorOauth2.xcodeproj/project.pbxproj b/ios/ByteowlsCapacitorOauth2/ByteowlsCapacitorOauth2.xcodeproj/project.pbxproj
deleted file mode 100644
index 62f53806..00000000
--- a/ios/ByteowlsCapacitorOauth2/ByteowlsCapacitorOauth2.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,408 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 50;
- objects = {
-
-/* Begin PBXBuildFile section */
- 18DD3EC6FD926A19540AA106 /* Pods_ByteowlsCapacitorOauth2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F94771610D9566B3ED5847 /* Pods_ByteowlsCapacitorOauth2.framework */; };
- FE1C41BD21861FFC00F8236E /* ByteowlsCapacitorOauth2.h in Headers */ = {isa = PBXBuildFile; fileRef = FE1C41BB21861FFC00F8236E /* ByteowlsCapacitorOauth2.h */; settings = {ATTRIBUTES = (Public, ); }; };
- FE6A4CC02441A56C00C4A2EB /* OAuth2SafariDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE6A4CBF2441A56C00C4A2EB /* OAuth2SafariDelegate.swift */; };
- FE9AC5F721862144009471A9 /* ByteowlsCapacitorOauth2.m in Sources */ = {isa = PBXBuildFile; fileRef = FE9AC5F421862144009471A9 /* ByteowlsCapacitorOauth2.m */; };
- FE9AC5F821862144009471A9 /* ByteowlsCapacitorOauth2.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE9AC5F521862144009471A9 /* ByteowlsCapacitorOauth2.swift */; };
- FECF0E40218727CB000096F6 /* OAuth2CustomHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = FECF0E3F218727CB000096F6 /* OAuth2CustomHandler.swift */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
- 50F94771610D9566B3ED5847 /* Pods_ByteowlsCapacitorOauth2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ByteowlsCapacitorOauth2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 80D48D1199882E584EB5E775 /* Pods-ByteowlsCapacitorOauth2.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ByteowlsCapacitorOauth2.release.xcconfig"; path = "Pods/Target Support Files/Pods-ByteowlsCapacitorOauth2/Pods-ByteowlsCapacitorOauth2.release.xcconfig"; sourceTree = ""; };
- E93EEABDBC3E0F5423DF22EB /* Pods-ByteowlsCapacitorOauth2.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ByteowlsCapacitorOauth2.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ByteowlsCapacitorOauth2/Pods-ByteowlsCapacitorOauth2.debug.xcconfig"; sourceTree = ""; };
- FE1C41B821861FFC00F8236E /* ByteowlsCapacitorOauth2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ByteowlsCapacitorOauth2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- FE1C41BB21861FFC00F8236E /* ByteowlsCapacitorOauth2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ByteowlsCapacitorOauth2.h; sourceTree = ""; };
- FE1C41BC21861FFC00F8236E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
- FE6A4CBF2441A56C00C4A2EB /* OAuth2SafariDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuth2SafariDelegate.swift; sourceTree = ""; };
- FE9AC5F421862144009471A9 /* ByteowlsCapacitorOauth2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ByteowlsCapacitorOauth2.m; sourceTree = ""; };
- FE9AC5F521862144009471A9 /* ByteowlsCapacitorOauth2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ByteowlsCapacitorOauth2.swift; sourceTree = ""; };
- FECF0E3F218727CB000096F6 /* OAuth2CustomHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuth2CustomHandler.swift; sourceTree = ""; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- FE1C41B521861FFC00F8236E /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 18DD3EC6FD926A19540AA106 /* Pods_ByteowlsCapacitorOauth2.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 34F01263DFDE9AF275C9C619 /* Pods */ = {
- isa = PBXGroup;
- children = (
- E93EEABDBC3E0F5423DF22EB /* Pods-ByteowlsCapacitorOauth2.debug.xcconfig */,
- 80D48D1199882E584EB5E775 /* Pods-ByteowlsCapacitorOauth2.release.xcconfig */,
- );
- name = Pods;
- sourceTree = "";
- };
- 7144C000E7B46E365CE4F0B8 /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 50F94771610D9566B3ED5847 /* Pods_ByteowlsCapacitorOauth2.framework */,
- );
- name = Frameworks;
- sourceTree = "";
- };
- FE1C41AE21861FFC00F8236E = {
- isa = PBXGroup;
- children = (
- FE1C41BA21861FFC00F8236E /* Source */,
- FE1C41B921861FFC00F8236E /* Products */,
- 34F01263DFDE9AF275C9C619 /* Pods */,
- 7144C000E7B46E365CE4F0B8 /* Frameworks */,
- );
- sourceTree = "";
- };
- FE1C41B921861FFC00F8236E /* Products */ = {
- isa = PBXGroup;
- children = (
- FE1C41B821861FFC00F8236E /* ByteowlsCapacitorOauth2.framework */,
- );
- name = Products;
- sourceTree = "";
- };
- FE1C41BA21861FFC00F8236E /* Source */ = {
- isa = PBXGroup;
- children = (
- FE9AC5F421862144009471A9 /* ByteowlsCapacitorOauth2.m */,
- FE9AC5F521862144009471A9 /* ByteowlsCapacitorOauth2.swift */,
- FE1C41BB21861FFC00F8236E /* ByteowlsCapacitorOauth2.h */,
- FE1C41BC21861FFC00F8236E /* Info.plist */,
- FECF0E3F218727CB000096F6 /* OAuth2CustomHandler.swift */,
- FE6A4CBF2441A56C00C4A2EB /* OAuth2SafariDelegate.swift */,
- );
- path = Source;
- sourceTree = "";
- };
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
- FE1C41B321861FFC00F8236E /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FE1C41BD21861FFC00F8236E /* ByteowlsCapacitorOauth2.h in Headers */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
- FE1C41B721861FFC00F8236E /* ByteowlsCapacitorOauth2 */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = FE1C41C021861FFC00F8236E /* Build configuration list for PBXNativeTarget "ByteowlsCapacitorOauth2" */;
- buildPhases = (
- 714F7C29706103C851AD5B57 /* [CP] Check Pods Manifest.lock */,
- FE1C41B321861FFC00F8236E /* Headers */,
- FE1C41B421861FFC00F8236E /* Sources */,
- FE1C41B521861FFC00F8236E /* Frameworks */,
- FE1C41B621861FFC00F8236E /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = ByteowlsCapacitorOauth2;
- productName = ByteowlsCapacitorOauth2;
- productReference = FE1C41B821861FFC00F8236E /* ByteowlsCapacitorOauth2.framework */;
- productType = "com.apple.product-type.framework";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- FE1C41AF21861FFC00F8236E /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastUpgradeCheck = 1250;
- ORGANIZATIONNAME = "BYTEOWLS Software & Consulting";
- TargetAttributes = {
- FE1C41B721861FFC00F8236E = {
- CreatedOnToolsVersion = 10.0;
- LastSwiftMigration = 1140;
- };
- };
- };
- buildConfigurationList = FE1C41B221861FFC00F8236E /* Build configuration list for PBXProject "ByteowlsCapacitorOauth2" */;
- compatibilityVersion = "Xcode 9.3";
- developmentRegion = en;
- hasScannedForEncodings = 0;
- knownRegions = (
- en,
- Base,
- );
- mainGroup = FE1C41AE21861FFC00F8236E;
- productRefGroup = FE1C41B921861FFC00F8236E /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- FE1C41B721861FFC00F8236E /* ByteowlsCapacitorOauth2 */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- FE1C41B621861FFC00F8236E /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
- 714F7C29706103C851AD5B57 /* [CP] Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
- );
- name = "[CP] Check Pods Manifest.lock";
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-ByteowlsCapacitorOauth2-checkManifestLockResult.txt",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
- showEnvVarsInLog = 0;
- };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- FE1C41B421861FFC00F8236E /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FE9AC5F821862144009471A9 /* ByteowlsCapacitorOauth2.swift in Sources */,
- FE6A4CC02441A56C00C4A2EB /* OAuth2SafariDelegate.swift in Sources */,
- FE9AC5F721862144009471A9 /* ByteowlsCapacitorOauth2.m in Sources */,
- FECF0E40218727CB000096F6 /* OAuth2CustomHandler.swift in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
- FE1C41BE21861FFC00F8236E /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ANALYZER_NONNULL = YES;
- CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_ENABLE_OBJC_WEAK = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGN_IDENTITY = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1;
- DEBUG_INFORMATION_FORMAT = dwarf;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- ENABLE_TESTABILITY = YES;
- GCC_C_LANGUAGE_STANDARD = gnu11;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 13.0;
- MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
- MTL_FAST_MATH = YES;
- ONLY_ACTIVE_ARCH = YES;
- SDKROOT = iphoneos;
- SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
- SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- VERSIONING_SYSTEM = "apple-generic";
- VERSION_INFO_PREFIX = "";
- };
- name = Debug;
- };
- FE1C41BF21861FFC00F8236E /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ANALYZER_NONNULL = YES;
- CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_ENABLE_OBJC_WEAK = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGN_IDENTITY = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- ENABLE_NS_ASSERTIONS = NO;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_C_LANGUAGE_STANDARD = gnu11;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 13.0;
- MTL_ENABLE_DEBUG_INFO = NO;
- MTL_FAST_MATH = YES;
- SDKROOT = iphoneos;
- SWIFT_COMPILATION_MODE = wholemodule;
- SWIFT_OPTIMIZATION_LEVEL = "-O";
- VALIDATE_PRODUCT = YES;
- VERSIONING_SYSTEM = "apple-generic";
- VERSION_INFO_PREFIX = "";
- };
- name = Release;
- };
- FE1C41C121861FFC00F8236E /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = E93EEABDBC3E0F5423DF22EB /* Pods-ByteowlsCapacitorOauth2.debug.xcconfig */;
- buildSettings = {
- CLANG_ENABLE_MODULES = YES;
- CODE_SIGN_IDENTITY = "";
- CODE_SIGN_STYLE = Automatic;
- DEFINES_MODULE = YES;
- DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
- DYLIB_INSTALL_NAME_BASE = "@rpath";
- INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
- INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 12.1;
- LD_RUNPATH_SEARCH_PATHS = (
- "$(inherited)",
- "@executable_path/Frameworks",
- "@loader_path/Frameworks",
- );
- PRODUCT_BUNDLE_IDENTIFIER = "com.byteowls.capacitor-oauth2.ByteowlsCapacitorOauth2";
- PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
- SKIP_INSTALL = YES;
- SUPPORTS_MACCATALYST = NO;
- SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 5.0;
- TARGETED_DEVICE_FAMILY = "1,2";
- };
- name = Debug;
- };
- FE1C41C221861FFC00F8236E /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 80D48D1199882E584EB5E775 /* Pods-ByteowlsCapacitorOauth2.release.xcconfig */;
- buildSettings = {
- CLANG_ENABLE_MODULES = YES;
- CODE_SIGN_IDENTITY = "";
- CODE_SIGN_STYLE = Automatic;
- DEFINES_MODULE = YES;
- DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
- DYLIB_INSTALL_NAME_BASE = "@rpath";
- INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
- INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 12.1;
- LD_RUNPATH_SEARCH_PATHS = (
- "$(inherited)",
- "@executable_path/Frameworks",
- "@loader_path/Frameworks",
- );
- PRODUCT_BUNDLE_IDENTIFIER = "com.byteowls.capacitor-oauth2.ByteowlsCapacitorOauth2";
- PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
- SKIP_INSTALL = YES;
- SUPPORTS_MACCATALYST = NO;
- SWIFT_VERSION = 5.0;
- TARGETED_DEVICE_FAMILY = "1,2";
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- FE1C41B221861FFC00F8236E /* Build configuration list for PBXProject "ByteowlsCapacitorOauth2" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- FE1C41BE21861FFC00F8236E /* Debug */,
- FE1C41BF21861FFC00F8236E /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- FE1C41C021861FFC00F8236E /* Build configuration list for PBXNativeTarget "ByteowlsCapacitorOauth2" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- FE1C41C121861FFC00F8236E /* Debug */,
- FE1C41C221861FFC00F8236E /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = FE1C41AF21861FFC00F8236E /* Project object */;
-}
diff --git a/ios/ByteowlsCapacitorOauth2/ByteowlsCapacitorOauth2.xcodeproj/xcuserdata/moberwasserlechner.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/ByteowlsCapacitorOauth2/ByteowlsCapacitorOauth2.xcodeproj/xcuserdata/moberwasserlechner.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 59ff86a3..00000000
--- a/ios/ByteowlsCapacitorOauth2/ByteowlsCapacitorOauth2.xcodeproj/xcuserdata/moberwasserlechner.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- SchemeUserState
-
- ByteowlsCapacitorOauth2.xcscheme
-
- orderHint
- 5
-
-
- SuppressBuildableAutocreation
-
- FE1C41B721861FFC00F8236E
-
- primary
-
-
-
-
-
diff --git a/ios/ByteowlsCapacitorOauth2/Podfile b/ios/ByteowlsCapacitorOauth2/Podfile
deleted file mode 100644
index 8489314f..00000000
--- a/ios/ByteowlsCapacitorOauth2/Podfile
+++ /dev/null
@@ -1,18 +0,0 @@
-require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
-# Uncomment the next line to define a global platform for your project
-platform :ios, '13.0'
-
-target 'ByteowlsCapacitorOauth2' do
- # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
- use_frameworks!
-
- # Pods for ByteowlsCapacitorOauth2
- pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
- pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
- pod 'OAuthSwift', :git => 'https://github.com/OAuthSwift/OAuthSwift.git'
-
-end
-
-post_install do |installer|
- assertDeploymentTarget(installer)
-end
diff --git a/ios/ByteowlsCapacitorOauth2/Source/ByteowlsCapacitorOauth2.h b/ios/ByteowlsCapacitorOauth2/Source/ByteowlsCapacitorOauth2.h
deleted file mode 100644
index 02f6241e..00000000
--- a/ios/ByteowlsCapacitorOauth2/Source/ByteowlsCapacitorOauth2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// ByteowlsCapacitorOauth2.h
-// ByteowlsCapacitorOauth2
-//
-// Created by Michael Oberwasserlechner on 28.10.18.
-// Copyright © 2018 BYTEOWLS Software & Consulting. All rights reserved.
-//
-
-#import
-
-//! Project version number for ByteowlsCapacitorOauth2.
-FOUNDATION_EXPORT double ByteowlsCapacitorOauth2VersionNumber;
-
-//! Project version string for ByteowlsCapacitorOauth2.
-FOUNDATION_EXPORT const unsigned char ByteowlsCapacitorOauth2VersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import
-
-
diff --git a/ios/Plugin.xcodeproj/project.pbxproj b/ios/Plugin.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..dabd8924
--- /dev/null
+++ b/ios/Plugin.xcodeproj/project.pbxproj
@@ -0,0 +1,579 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 48;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 03FC29A292ACC40490383A1F /* Pods_Plugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B2A61DA5A1F2DD4F959604D /* Pods_Plugin.framework */; };
+ 20C0B05DCFC8E3958A738AF2 /* Pods_PluginTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6753A823D3815DB436415E3 /* Pods_PluginTests.framework */; };
+ 451C6E972BE3BF4400D9577D /* OAuth2CustomHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451C6E962BE3BF4400D9577D /* OAuth2CustomHandler.swift */; };
+ 451C6E992BE3BF7200D9577D /* OAuth2SafariDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451C6E982BE3BF7200D9577D /* OAuth2SafariDelegate.swift */; };
+ 451C6E9B2BE3BF9F00D9577D /* GenericOAuth2Plugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451C6E9A2BE3BF9F00D9577D /* GenericOAuth2Plugin.swift */; };
+ 50ADFF92201F53D600D50D53 /* Plugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50ADFF88201F53D600D50D53 /* Plugin.framework */; };
+ 50ADFF97201F53D600D50D53 /* GenericOAuth2Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50ADFF96201F53D600D50D53 /* GenericOAuth2Tests.swift */; };
+ 50ADFF99201F53D600D50D53 /* GenericOAuth2Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ADFF8B201F53D600D50D53 /* GenericOAuth2Plugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 50ADFFA42020D75100D50D53 /* Capacitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50ADFFA52020D75100D50D53 /* Capacitor.framework */; };
+ 50ADFFA82020EE4F00D50D53 /* GenericOAuth2Plugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 50ADFFA72020EE4F00D50D53 /* GenericOAuth2Plugin.m */; };
+ 50E1A94820377CB70090CE1A /* GenericOAuth2Plugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E1A94720377CB70090CE1A /* GenericOAuth2Plugin.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+ 50ADFF93201F53D600D50D53 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 50ADFF7F201F53D600D50D53 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 50ADFF87201F53D600D50D53;
+ remoteInfo = Plugin;
+ };
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+ 3B2A61DA5A1F2DD4F959604D /* Pods_Plugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Plugin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 451C6E962BE3BF4400D9577D /* OAuth2CustomHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OAuth2CustomHandler.swift; sourceTree = ""; };
+ 451C6E982BE3BF7200D9577D /* OAuth2SafariDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OAuth2SafariDelegate.swift; sourceTree = ""; };
+ 451C6E9A2BE3BF9F00D9577D /* GenericOAuth2Plugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenericOAuth2Plugin.swift; sourceTree = ""; };
+ 50ADFF88201F53D600D50D53 /* Plugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Plugin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 50ADFF8B201F53D600D50D53 /* GenericOAuth2Plugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GenericOAuth2Plugin.h; sourceTree = ""; };
+ 50ADFF8C201F53D600D50D53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
+ 50ADFF91201F53D600D50D53 /* PluginTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PluginTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+ 50ADFF96201F53D600D50D53 /* GenericOAuth2Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericOAuth2Tests.swift; sourceTree = "