Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8e2879e authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch 'dev/fix-android-base-requirement' into 'main' 

Fix android base requirement and target version

See merge request !38
parents 8275838f 99f78ac5

app/index.html

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
      name="viewport"

      content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1.0, user-scalable=0"

    />

    <meta name="version" content="0.12.2" />

    <meta name="version" content="0.12.3" />

    <link rel="stylesheet" href="/css/styles.css" />

    <link rel="stylesheet" href="/css/loader.css" />

    <title>/e/OS Installer</title>

app/package-lock.json

+2 −2
Original line number Diff line number Diff line 
{

  "name": "eOS-installer",

  "version": "0.12.2",

  "version": "0.12.3",

  "lockfileVersion": 3,

  "requires": true,

  "packages": {

    "": {

      "name": "eOS-installer",

      "version": "0.12.2",

      "version": "0.12.3",

      "license": "GPLv3",

      "dependencies": {

        "@e/fastboot": "1.1.4",

app/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "eOS-installer",

  "license": "GPLv3",

  "version": "0.12.2",

  "version": "0.12.3",

  "type": "module",

  "scripts": {

    "dev": "vite",

app/public/resources/OnePlus7.json

+3 −3
Original line number Diff line number Diff line 
{

  "android": 14,

  "android": 12,

  "steps": [

    {

      "command": "reboot bootloader"
@@ -76,7 +76,7 @@ 
  "folder": [

    {

      "name": "One+ 7 recovery installer",

      "path": "https://images.ecloud.global/community/guacamoleb/recovery-IMG-e-latest-t-community-guacamoleb.zip",

      "path": "https://images.ecloud.global/community/guacamoleb/recovery-IMG-e-latest-a14-community-guacamoleb.zip",

      "unzip": true,

      "mapping": {

        "^dtbo.*img$": "dtbo.img",
@@ -86,7 +86,7 @@ 
    },

    {

      "name": "oneplus-7-rom.zip",

      "path": "https://images.ecloud.global/community/guacamoleb/e-latest-t-community-guacamoleb.zip"

      "path": "https://images.ecloud.global/community/guacamoleb/e-latest-a14-community-guacamoleb.zip"

    }

  ]

}

app/public/resources/OnePlus7Pro.json

+3 −3
Original line number Diff line number Diff line 
{

  "android": 14,

  "android": 12,

  "steps": [

    {

      "command": "reboot bootloader"
@@ -76,7 +76,7 @@ 
  "folder": [

    {

      "name": "One+ 7 Pro recovery installer",

      "path": "https://images.ecloud.global/community/guacamole/recovery-IMG-e-latest-t-community-guacamole.zip",

      "path": "https://images.ecloud.global/community/guacamole/recovery-IMG-e-latest-a14-community-guacamole.zip",

      "unzip": true,

      "mapping": {

        "^dtbo.*img$": "dtbo.img",
@@ -86,7 +86,7 @@ 
    },

    {

      "name": "oneplus-7pro-rom.zip",

      "path": "https://images.ecloud.global/community/guacamole/e-latest-t-community-guacamole.zip"

      "path": "https://images.ecloud.global/community/guacamole/e-latest-a14-community-guacamole.zip"

    }

  ]

}