diff --git a/README.md b/README.md index 8ac0e0a..8242e14 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# The Electric Imp BlinkUp SDK for Android 6.4.5 # +# The Electric Imp BlinkUp SDK for Android 6.5.0 # This repo contains the Electric Imp BlinkUp™ SDK for Android as it is made available to Electric Imp customers. It mirrors the downloadable files hosted by the [Dev Center](https://developer.electricimp.com/manufacturing/sdkdocs), but in a form that allows developers to add the SDK to their app project repos as a sub-module. This will allow them to pull in SDK changes manually at build time, or automatically through their build scripts. diff --git a/sdk/README.md b/sdk/README.md index 9bfed51..d8cbff3 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -1,4 +1,4 @@ -# Electric Imp Android BlinkUp SDK 6.4.5 # +# Electric Imp Android BlinkUp SDK 6.5.0 # - [Introduction](#introduction) - [Installation](#installation) @@ -15,7 +15,7 @@ Electric Imp's BlinkUp™ technology is used to activate and configure devices b #### Notice #### -The Electric Imp Android BlinkUp SDK is licensed solely for the provision of BlinkUp services within mobile apps developed by or on behalf of Electric Imp customers. All rights reserved. The Android BlinkUp SDK is copyright Twilio, Inc. 2021. +The Electric Imp Android BlinkUp SDK is licensed solely for the provision of BlinkUp services within mobile apps developed by or on behalf of Electric Imp customers. All rights reserved. The Android BlinkUp SDK is copyright KORE Wireless, Inc. 2023. ## Installation ## @@ -29,10 +29,8 @@ After you have compiled a sample project successfully, you can integrate the Bli 1. Open your project in Android Studio. Copy the directory `repo` into `app/repo` in the project list. 2. Add the following code to `app/build.gradle`: ```java - repositories { - maven { - url "$projectDir/repo" - } + dependencies { + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) } ``` @@ -85,7 +83,7 @@ blinkup = new BlinkupController(); blinkup.setPlanID(retrievedPlanID); ``` -You can now call one of the SDK's *setupDevice(...)* functions according to whether your imp-enabled device connects by Ethernet, cellular or WiFi. Whichever of these calls you use, the SDK will retrieve a new setup token, bundle it with the previously set plan ID and send them to the device using BlinkUp. +You can now call one of the SDK's setupDevice(...) functions based on your imp-enabled device's connection type—Ethernet, cellular, or WiFi. If your device connects by cellular and requires a custom APN, you can use setupDeviceWithCustomApn(...). Whichever of these calls you use, the SDK will retrieve a new setup token, bundle it with the previously set plan ID, and send them to the device using BlinkUp **Note** If you do not call *setPlanID()*, then the SDK will acquire a new plan ID for you. @@ -122,13 +120,10 @@ For information on licensing, please see the file `licensing/README.md`. ## Release Notes ## -### 6.4.5 ### +### 6.5.0 ### -- Under Android 11 on devices running a 90Hz or 120Hz display refresh rate, switch display to 60Hz during BlinkUp for greater stability. +- introduces a new option allowing users to set a custom APN for cellular connections, with the flexibility to leave it blank if the default APN is preferred. -### 6.4.4 ### - -- Support 120Hz frame rate on Samsung Galaxy S20 (and possibly other devices running refresh rates >60Hz). ### 6.4.3 ### @@ -238,4 +233,4 @@ The SDK is packaged as a maven repo instead of just a .aar file. Please replace - **BREAKING CHANGE** BlinkupController interfaces has been moved: - BlinkupController.ServerErrorHandler -> ServerErrorHandler - BlinkupController.TokenAcquireCallback -> TokenAcquireCallback - - BlinkupController.TokenStatusCallback -> TokenStatusCallback \ No newline at end of file + - BlinkupController.TokenStatusCallback -> TokenStatusCallback diff --git a/sdk/javadoc/BlinkupController.html b/sdk/javadoc/BlinkupController.html index a10a891..972b3a4 100644 --- a/sdk/javadoc/BlinkupController.html +++ b/sdk/javadoc/BlinkupController.html @@ -1,1412 +1,1229 @@ - - + - -BlinkupController (blinkup 6.4.5 API) + +BlinkupController (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Class BlinkupController

+ +

Class BlinkupController

-
- -
-
    -
  • -
    -
    -
    public class BlinkupController
    -extends Object
    -
  • -
+
java.lang.Object +
com.electricimp.blinkup.BlinkupController
-
-
+
+ - - +
+
void
+
setupDeviceWithCustomApn(Activity activity, + String apiKey, + Proxy proxy, + StaticIp staticIp, + boolean legacyMode, + String apn, + ServerErrorHandler errorHandler)
+
+
Show BlinkUp with Cellular custom APN.
+
+
+
+ +
+

Methods inherited from class java.lang.Object

+clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+ - -
-
+
+
Parameters:
activity - Your activity
-
requestCode - Request code from onActivityResult
-
resultCode - Result code from onActivityResult
-
data - Intent from onActivityResult
+
requestCode - Request code from onActivityResult
+
resultCode - Result code from onActivityResult
+
data - Intent from onActivityResult
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + - diff --git a/sdk/javadoc/Proxy.Error.html b/sdk/javadoc/Proxy.Error.html index 79e179a..0e18b30 100644 --- a/sdk/javadoc/Proxy.Error.html +++ b/sdk/javadoc/Proxy.Error.html @@ -1,232 +1,190 @@ - - + - -Proxy.Error (blinkup 6.4.5 API) + +Proxy.Error (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Enum Proxy.Error

+ +

Enum Class Proxy.Error

-
- -
-
-
-
+
+
+
+
+

Methods inherited from class java.lang.Enum

+clone, compareTo, describeConstable, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
+
+

Methods inherited from class java.lang.Object

+getClass, notify, notifyAll, wait, wait, wait
+ - -
-
- diff --git a/sdk/javadoc/Proxy.html b/sdk/javadoc/Proxy.html index 0ced218..cd62803 100644 --- a/sdk/javadoc/Proxy.html +++ b/sdk/javadoc/Proxy.html @@ -1,279 +1,217 @@ - - + - -Proxy (blinkup 6.4.5 API) + +Proxy (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Class Proxy

+ +

Class Proxy

-
- -
-
    -
  • -
    -
    -
    public class Proxy
    -extends Object
    -
  • -
+
java.lang.Object +
com.electricimp.blinkup.Proxy
-
-
-
-
    -
  • + +
    +
      -
        -
      • - - -

        Field Detail

        - - - -
          -
        • -

          useProxy

          -
          public boolean useProxy
          +
        • +
          +

          Field Details

          +
            +
          • +
            +

            useProxy

            +
            public boolean useProxy
            +
          • -
          - - - -
            -
          • -

            port

            -
            public int port
            +
          • +
            +

            port

            +
            public int port
            +
          • -
          - - - -
            -
          • -

            server

            -
            public String server
            +
          • +
            +

            server

            +
            public String server
            +
          • -
          - - - -
            -
          • -

            username

            -
            public String username
            +
          • +
            +

            username

            +
            public String username
            +
          • -
          - - - -
            -
          • -

            password

            -
            public String password
            +
          • +
            +

            password

            +
            public String password
            +
          +
        • -
        -
          -
        • - - -

          Constructor Detail

          - - - -
            -
          • -

            Proxy

            -
            public Proxy()
            +
          • +
            +

            Constructor Details

            +
              +
            • +
              +

              Proxy

              +
              public Proxy()
              +
            +
          • -
          -
            -
          • - - -

            Method Detail

            - - - -
              -
            • -

              onSaveInstanceState

              -
              public Parcelable onSaveInstanceState()
              -
            • -
            - - - -
              -
            • -

              onRestoreInstanceState

              -
              public void onRestoreInstanceState(Parcelable state)
              +
            • +
              +

              Method Details

              +
                +
              • +
                +

                onSaveInstanceState

                +
                public Parcelable onSaveInstanceState()
                +
              • -
              - - - -
                -
              • -

                getErrors

                -
                public EnumSet<Proxy.Error> getErrors()
                +
              • +
                +

                onRestoreInstanceState

                +
                public void onRestoreInstanceState(Parcelable state)
                +
              • -
              +
            • +
              +

              getErrors

              +
              public EnumSet<Proxy.Error> getErrors()
              +
            +
+ + +
- diff --git a/sdk/javadoc/ServerErrorHandler.html b/sdk/javadoc/ServerErrorHandler.html index 6ef6ffc..c982318 100644 --- a/sdk/javadoc/ServerErrorHandler.html +++ b/sdk/javadoc/ServerErrorHandler.html @@ -1,97 +1,86 @@ - - + - -ServerErrorHandler (blinkup 6.4.5 API) + +ServerErrorHandler (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Interface ServerErrorHandler

+ +

Interface ServerErrorHandler

-
-
-
    -
  • +

    -
    -
    public interface ServerErrorHandler
    +
    public interface ServerErrorHandler
    Interface to handle api key errors.
    -
  • -
-
-
-
    -
  • + +
    + +
  • +
    +

    Method Summary

    +
    +
    +
    +
    +
    Modifier and Type
    +
    Method
    +
    Description
    +
    void
    +
    onError(String errorMsg)
    +
     
    -
    -
      -
    • - -
        -
      • - - -

        Method Detail

        - - - -
          -
        • -

          onError

          -
          void onError(String errorMsg)
          +
    +
    +
+ +
+
    + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      onError

      +
      void onError(String errorMsg)
      +
    +
+
+ +
- diff --git a/sdk/javadoc/StaticIp.Error.html b/sdk/javadoc/StaticIp.Error.html index f5f5050..8a44e07 100644 --- a/sdk/javadoc/StaticIp.Error.html +++ b/sdk/javadoc/StaticIp.Error.html @@ -1,256 +1,206 @@ - - + - -StaticIp.Error (blinkup 6.4.5 API) + +StaticIp.Error (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Enum StaticIp.Error

+ +

Enum Class StaticIp.Error

-
- -
-
-
-
-
-
    -
  • +
+
+
+
+

Methods inherited from class java.lang.Enum

+clone, compareTo, describeConstable, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
+
+

Methods inherited from class java.lang.Object

+getClass, notify, notifyAll, wait, wait, wait
+ + + + +
+
+ +
- diff --git a/sdk/javadoc/StaticIp.html b/sdk/javadoc/StaticIp.html index 1f5a8fa..b1ede61 100644 --- a/sdk/javadoc/StaticIp.html +++ b/sdk/javadoc/StaticIp.html @@ -1,292 +1,226 @@ - - + - -StaticIp (blinkup 6.4.5 API) + +StaticIp (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Class StaticIp

+ +

Class StaticIp

-
- -
-
    -
  • -
    -
    -
    public class StaticIp
    -extends Object
    -
  • -
+
java.lang.Object +
com.electricimp.blinkup.StaticIp
-
-
-
-
    -
  • + +
    +
      -
        -
      • - - -

        Field Detail

        - - - -
          -
        • -

          useStaticIp

          -
          public boolean useStaticIp
          +
        • +
          +

          Field Details

          +
            +
          • +
            +

            useStaticIp

            +
            public boolean useStaticIp
            +
          • -
          - - - -
            -
          • -

            ipAddress

            -
            public String ipAddress
            +
          • +
            +

            ipAddress

            +
            public String ipAddress
            +
          • -
          - - - -
            -
          • -

            netmask

            -
            public String netmask
            +
          • +
            +

            netmask

            +
            public String netmask
            +
          • -
          - - - -
            -
          • -

            gateway

            -
            public String gateway
            +
          • +
            +

            gateway

            +
            public String gateway
            +
          • -
          - - - -
            -
          • -

            dns1

            -
            public String dns1
            +
          • +
            +

            dns1

            +
            public String dns1
            +
          • -
          - - - -
            -
          • -

            dns2

            -
            public String dns2
            +
          • +
            +

            dns2

            +
            public String dns2
            +
          +
        • -
        -
          -
        • - - -

          Constructor Detail

          - - - -
            -
          • -

            StaticIp

            -
            public StaticIp()
            +
          • +
            +

            Constructor Details

            +
              +
            • +
              +

              StaticIp

              +
              public StaticIp()
              +
            +
          • -
          -
            -
          • - - -

            Method Detail

            - - - -
              -
            • -

              onSaveInstanceState

              -
              public Parcelable onSaveInstanceState()
              -
            • -
            - - - -
              -
            • -

              onRestoreInstanceState

              -
              public void onRestoreInstanceState(Parcelable state)
              +
            • +
              +

              Method Details

              +
                +
              • +
                +

                onSaveInstanceState

                +
                public Parcelable onSaveInstanceState()
                +
              • -
              - - - - +
            • +
              +

              getErrors

              +
              public EnumSet<StaticIp.Error> getErrors()
              +
            +
+ + +
- diff --git a/sdk/javadoc/TokenAcquireCallback.html b/sdk/javadoc/TokenAcquireCallback.html index 64b8f12..e548d91 100644 --- a/sdk/javadoc/TokenAcquireCallback.html +++ b/sdk/javadoc/TokenAcquireCallback.html @@ -1,112 +1,97 @@ - - + - -TokenAcquireCallback (blinkup 6.4.5 API) + +TokenAcquireCallback (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Interface TokenAcquireCallback

+ +

Interface TokenAcquireCallback

-
-
-
    -
  • +

    -
    -
    public interface TokenAcquireCallback
    +
    public interface TokenAcquireCallback
    Interface to acquire a setup token.
    -
  • -
-
-
- - - - -
    -
  • -

    onError

    -
    void onError(String errorMsg)
    + +
    +
      + +
    • +
      +

      Method Details

      +
        +
      • +
        +

        onSuccess

        +
        void onSuccess(String planID, + String setupToken)
        +
      • -
      +
    • +
      +

      onError

      +
      void onError(String errorMsg)
      +
    +
+ + +
- diff --git a/sdk/javadoc/TokenStatusCallback.html b/sdk/javadoc/TokenStatusCallback.html index 65668f1..15e3a8b 100644 --- a/sdk/javadoc/TokenStatusCallback.html +++ b/sdk/javadoc/TokenStatusCallback.html @@ -1,123 +1,104 @@ - - + - -TokenStatusCallback (blinkup 6.4.5 API) + +TokenStatusCallback (blinkup 6.5.0 API) + + + + + + + + - - + + +
+
+
-
com.electricimp.blinkup
-

Interface TokenStatusCallback

+ +

Interface TokenStatusCallback

-
-
-
    -
  • +

    -
    -
    public interface TokenStatusCallback
    +
    public interface TokenStatusCallback
    Interface to fetch the agent url, impee ID and verified date after BlinkUp.
    -
  • -
-
-
- - - - -
    -
  • -

    onError

    -
    void onError(String errorMsg)
    + +
    +
      + +
    • +
      +

      Method Details

      +
        +
      • +
        +

        onSuccess

        +
        void onSuccess(JSONObject json)
        +
      • -
      - - - -
        -
      • -

        onTimeout

        -
        void onTimeout()
        +
      • +
        +

        onError

        +
        void onError(String errorMsg)
        +
      • -
      +
    • +
      +

      onTimeout

      +
      void onTimeout()
      +
    +
+ + +
- diff --git a/sdk/javadoc/stylesheet.css b/sdk/javadoc/stylesheet.css index 98055b2..4a576bd 100644 --- a/sdk/javadoc/stylesheet.css +++ b/sdk/javadoc/stylesheet.css @@ -1,36 +1,45 @@ -/* Javadoc style sheet */ /* -Overall document style -*/ + * Javadoc style sheet + */ @import url('resources/fonts/dejavu.css'); +/* + * Styles for individual HTML elements. + * + * These are styles that are specific to individual HTML elements. Changing them affects the style of a particular + * HTML element throughout the page. + */ + body { background-color:#ffffff; color:#353833; font-family:'DejaVu Sans', Arial, Helvetica, sans-serif; font-size:14px; margin:0; + padding:0; + height:100%; + width:100%; +} +iframe { + margin:0; + padding:0; + height:100%; + width:100%; + overflow-y:scroll; + border:none; } a:link, a:visited { text-decoration:none; color:#4A6782; } -a:hover, a:focus { +a[href]:hover, a[href]:focus { text-decoration:none; color:#bb7a2a; } -a:active { - text-decoration:none; - color:#4A6782; -} a[name] { color:#353833; } -a[name]:hover { - text-decoration:none; - color:#353833; -} pre { font-family:'DejaVu Sans Mono', monospace; font-size:14px; @@ -43,22 +52,24 @@ h2 { } h3 { font-size:16px; - font-style:italic; } h4 { - font-size:13px; + font-size:15px; } h5 { - font-size:12px; + font-size:14px; } h6 { - font-size:11px; + font-size:13px; } ul { list-style-type:disc; } code, tt { font-family:'DejaVu Sans Mono', monospace; +} +:not(h1, h2, h3, h4, h5, h6) > code, +:not(h1, h2, h3, h4, h5, h6) > tt { font-size:14px; padding-top:4px; margin-top:8px; @@ -69,7 +80,7 @@ dt code { font-size:14px; padding-top:4px; } -table tr td dt code { +.summary-table dt code { font-family:'DejaVu Sans Mono', monospace; font-size:14px; vertical-align:top; @@ -78,31 +89,34 @@ table tr td dt code { sup { font-size:8px; } +button { + font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif; + font-size: 14px; +} +/* + * Styles for HTML generated by javadoc. + * + * These are style classes that are used by the standard doclet to generate HTML documentation. + */ + /* -Document title and Copyright styles -*/ + * Styles for document title and copyright. + */ .clear { clear:both; - height:0px; + height:0; overflow:hidden; } -.aboutLanguage { +.about-language { float:right; - padding:0px 21px; + padding:0 21px 8px 8px; font-size:11px; - z-index:200; margin-top:-9px; + height:2.9em; } -.legalCopy { +.legal-copy { margin-left:.5em; } -.bar a, .bar a:link, .bar a:visited, .bar a:active { - color:#FFFFFF; - text-decoration:none; -} -.bar a:hover, .bar a:focus { - color:#bb7a2a; -} .tab { background-color:#0066FF; color:#ffffff; @@ -111,263 +125,240 @@ Document title and Copyright styles font-weight:bold; } /* -Navigation bar styles -*/ -.bar { - background-color:#4D7A97; - color:#FFFFFF; - padding:.8em .5em .4em .8em; - height:auto;/*height:1.8em;*/ - font-size:11px; - margin:0; -} -.topNav { - background-color:#4D7A97; - color:#FFFFFF; - float:left; - padding:0; - width:100%; - clear:right; - height:2.8em; - padding-top:10px; - overflow:hidden; - font-size:12px; -} -.bottomNav { - margin-top:10px; + * Styles for navigation bar. + */ +@media screen { + .flex-box { + position:fixed; + display:flex; + flex-direction:column; + height: 100%; + width: 100%; + } + .flex-header { + flex: 0 0 auto; + } + .flex-content { + flex: 1 1 auto; + overflow-y: auto; + } +} +.top-nav { background-color:#4D7A97; color:#FFFFFF; float:left; padding:0; width:100%; clear:right; - height:2.8em; + min-height:2.8em; padding-top:10px; overflow:hidden; font-size:12px; } -.subNav { +.sub-nav { background-color:#dee3e9; float:left; width:100%; overflow:hidden; font-size:12px; } -.subNav div { +.sub-nav div { clear:left; float:left; padding:0 0 5px 6px; text-transform:uppercase; } -ul.navList, ul.subNavList { +.sub-nav .nav-list { + padding-top:5px; +} +ul.nav-list { + display:block; + margin:0 25px 0 0; + padding:0; +} +ul.sub-nav-list { float:left; margin:0 25px 0 0; padding:0; } -ul.navList li{ +ul.nav-list li { list-style:none; float:left; padding: 5px 6px; text-transform:uppercase; } -ul.subNavList li{ +.sub-nav .nav-list-search { + float:right; + margin:0 0 0 0; + padding:5px 6px; + clear:none; +} +.nav-list-search label { + position:relative; + right:-16px; +} +ul.sub-nav-list li { list-style:none; float:left; + padding-top:10px; } -.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { +.top-nav a:link, .top-nav a:active, .top-nav a:visited { color:#FFFFFF; text-decoration:none; text-transform:uppercase; } -.topNav a:hover, .bottomNav a:hover { +.top-nav a:hover { text-decoration:none; color:#bb7a2a; text-transform:uppercase; } -.navBarCell1Rev { +.nav-bar-cell1-rev { background-color:#F8981D; color:#253441; margin: auto 5px; } -.skipNav { +.skip-nav { position:absolute; top:auto; left:-9999px; overflow:hidden; } /* -Page header and footer styles -*/ -.header, .footer { - clear:both; - margin:0 20px; - padding:5px 0 0 0; -} -.indexHeader { - margin:10px; - position:relative; -} -.indexHeader span{ - margin-right:15px; -} -.indexHeader h1 { - font-size:13px; + * Hide navigation links and search box in print layout + */ +@media print { + ul.nav-list, div.sub-nav { + display:none; + } } +/* + * Styles for page header and footer. + */ .title { color:#2c4557; margin:10px 0; } -.subTitle { +.sub-title { margin:5px 0 0 0; } .header ul { margin:0 0 15px 0; padding:0; } -.footer ul { - margin:20px 0 5px 0; -} .header ul li, .footer ul li { list-style:none; font-size:13px; } /* -Heading styles -*/ -div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { - background-color:#dee3e9; - border:1px solid #d0d9e0; - margin:0 0 6px -8px; - padding:7px 5px; + * Styles for headings. + */ +body.class-declaration-page .summary h2, +body.class-declaration-page .details h2, +body.class-use-page h2, +body.module-declaration-page .block-list h2 { + font-style: italic; + padding:0; + margin:15px 0; } -ul.blockList ul.blockList ul.blockList li.blockList h3 { +body.class-declaration-page .summary h3, +body.class-declaration-page .details h3, +body.class-declaration-page .summary .inherited-list h2 { background-color:#dee3e9; border:1px solid #d0d9e0; margin:0 0 6px -8px; padding:7px 5px; } -ul.blockList ul.blockList li.blockList h3 { - padding:0; - margin:15px 0; -} -ul.blockList li.blockList h2 { - padding:0px 0 20px 0; -} /* -Page layout container styles -*/ -.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { + * Styles for page layout containers. + */ +main { clear:both; padding:10px 20px; position:relative; } -.indexContainer { - margin:10px; - position:relative; - font-size:12px; -} -.indexContainer h2 { - font-size:13px; - padding:0 0 3px 0; -} -.indexContainer ul { - margin:0; - padding:0; -} -.indexContainer ul li { - list-style:none; - padding-top:2px; -} -.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { +dl.notes > dt { + font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif; font-size:12px; font-weight:bold; margin:10px 0 0 0; color:#4E4E4E; } -.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { - margin:5px 0 10px 0px; +dl.notes > dd { + margin:5px 10px 10px 0; font-size:14px; - font-family:'DejaVu Sans Mono',monospace; + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; } -.serializedFormContainer dl.nameValue dt { +dl.name-value > dt { margin-left:1px; font-size:1.1em; display:inline; font-weight:bold; } -.serializedFormContainer dl.nameValue dd { +dl.name-value > dd { margin:0 0 0 1px; font-size:1.1em; display:inline; } /* -List styles -*/ + * Styles for lists. + */ +li.circle { + list-style:circle; +} ul.horizontal li { display:inline; font-size:0.9em; } -ul.inheritance { +div.inheritance { margin:0; padding:0; } -ul.inheritance li { - display:inline; - list-style:none; -} -ul.inheritance li ul.inheritance { - margin-left:15px; - padding-left:15px; - padding-top:1px; +div.inheritance div.inheritance { + margin-left:2em; } -ul.blockList, ul.blockListLast { +ul.block-list, +ul.details-list, +ul.member-list, +ul.summary-list { margin:10px 0 10px 0; padding:0; } -ul.blockList li.blockList, ul.blockListLast li.blockList { +ul.block-list > li, +ul.details-list > li, +ul.member-list > li, +ul.summary-list > li { list-style:none; margin-bottom:15px; line-height:1.4; } -ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { - padding:0px 20px 5px 10px; - border:1px solid #ededed; - background-color:#f8f8f8; -} -ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { - padding:0 0 5px 8px; - background-color:#ffffff; - border:none; +.summary-table dl, .summary-table dl dt, .summary-table dl dd { + margin-top:0; + margin-bottom:1px; } -ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { - margin-left:0; - padding-left:0; - padding-bottom:15px; - border:none; +ul.see-list, ul.see-list-long { + padding-left: 0; + list-style: none; } -ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { - list-style:none; - border-bottom:none; - padding-bottom:0; +ul.see-list li { + display: inline; } -table tr td dl, table tr td dl dt, table tr td dl dd { - margin-top:0; - margin-bottom:1px; +ul.see-list li:not(:last-child):after, +ul.see-list-long li:not(:last-child):after { + content: ", "; + white-space: pre-wrap; } /* -Table styles -*/ -.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary { + * Styles for tables. + */ +.summary-table, .details-table { width:100%; - border-left:1px solid #EEE; - border-right:1px solid #EEE; - border-bottom:1px solid #EEE; -} -.overviewSummary, .memberSummary { - padding:0px; + border-spacing:0; + border-left:1px solid #EEE; + border-right:1px solid #EEE; + border-bottom:1px solid #EEE; + padding:0; } -.overviewSummary caption, .memberSummary caption, .typeSummary caption, -.useSummary caption, .constantsSummary caption, .deprecatedSummary caption { +.caption { position:relative; text-align:left; background-repeat:no-repeat; @@ -375,24 +366,20 @@ Table styles font-weight:bold; clear:none; overflow:hidden; - padding:0px; + padding:0; padding-top:10px; padding-left:1px; - margin:0px; + margin:0; white-space:pre; } -.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link, -.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link, -.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover, -.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover, -.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active, -.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active, -.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited, -.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited { +.caption a:link, .caption a:visited { + color:#1f389c; +} +.caption a:hover, +.caption a:active { color:#FFFFFF; } -.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span, -.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span { +.caption span { white-space:nowrap; padding-top:5px; padding-left:12px; @@ -404,144 +391,150 @@ Table styles border: none; height:16px; } -.memberSummary caption span.activeTableTab span { - white-space:nowrap; - padding-top:5px; - padding-left:12px; - padding-right:12px; - margin-right:3px; - display:inline-block; - float:left; - background-color:#F8981D; - height:16px; -} -.memberSummary caption span.tableTab span { - white-space:nowrap; - padding-top:5px; - padding-left:12px; - padding-right:12px; - margin-right:3px; - display:inline-block; - float:left; - background-color:#4D7A97; - height:16px; -} -.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab { - padding-top:0px; - padding-left:0px; - padding-right:0px; - background-image:none; - float:none; - display:inline; -} -.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, -.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd { - display:none; - width:5px; - position:relative; - float:left; - background-color:#F8981D; -} -.memberSummary .activeTableTab .tabEnd { - display:none; - width:5px; - margin-right:3px; - position:relative; - float:left; - background-color:#F8981D; -} -.memberSummary .tableTab .tabEnd { - display:none; - width:5px; - margin-right:3px; - position:relative; - background-color:#4D7A97; - float:left; - +div.table-tabs { + padding:10px 0 0 1px; + margin:0; } -.overviewSummary td, .memberSummary td, .typeSummary td, -.useSummary td, .constantsSummary td, .deprecatedSummary td { +div.table-tabs > button { + border: none; + cursor: pointer; + padding: 5px 12px 7px 12px; + font-weight: bold; + margin-right: 3px; +} +div.table-tabs > button.active-table-tab { + background: #F8981D; + color: #253441; +} +div.table-tabs > button.table-tab { + background: #4D7A97; + color: #FFFFFF; +} +.two-column-summary { + display: grid; + grid-template-columns: minmax(15%, max-content) minmax(15%, auto); +} +.three-column-summary { + display: grid; + grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, auto); +} +.four-column-summary { + display: grid; + grid-template-columns: minmax(10%, max-content) minmax(10%, max-content) minmax(10%, max-content) minmax(10%, auto); +} +@media screen and (max-width: 600px) { + .two-column-summary { + display: grid; + grid-template-columns: 1fr; + } +} +@media screen and (max-width: 800px) { + .three-column-summary { + display: grid; + grid-template-columns: minmax(10%, max-content) minmax(25%, auto); + } + .three-column-summary .col-last { + grid-column-end: span 2; + } +} +@media screen and (max-width: 1000px) { + .four-column-summary { + display: grid; + grid-template-columns: minmax(15%, max-content) minmax(15%, auto); + } +} +.summary-table > div, .details-table > div { text-align:left; - padding:0px 0px 12px 10px; + padding: 8px 3px 3px 7px; } -th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th, -td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{ +.col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name { vertical-align:top; - padding-right:0px; + padding-right:0; padding-top:8px; padding-bottom:3px; } -th.colFirst, th.colLast, th.colOne, .constantsSummary th { +.table-header { background:#dee3e9; - text-align:left; - padding:8px 3px 3px 7px; + font-weight: bold; } -td.colFirst, th.colFirst { - white-space:nowrap; +.col-first, .col-first { font-size:13px; } -td.colLast, th.colLast { +.col-second, .col-second, .col-last, .col-constructor-name, .col-summary-item-name, .col-last { font-size:13px; } -td.colOne, th.colOne { - font-size:13px; -} -.overviewSummary td.colFirst, .overviewSummary th.colFirst, -.useSummary td.colFirst, .useSummary th.colFirst, -.overviewSummary td.colOne, .overviewSummary th.colOne, -.memberSummary td.colFirst, .memberSummary th.colFirst, -.memberSummary td.colOne, .memberSummary th.colOne, -.typeSummary td.colFirst{ - width:25%; +.col-first, .col-second, .col-constructor-name { vertical-align:top; -} -td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { + overflow: auto; +} +.col-last { + white-space:normal; +} +.col-first a:link, .col-first a:visited, +.col-second a:link, .col-second a:visited, +.col-first a:link, .col-first a:visited, +.col-second a:link, .col-second a:visited, +.col-constructor-name a:link, .col-constructor-name a:visited, +.col-summary-item-name a:link, .col-summary-item-name a:visited, +.constant-values-container a:link, .constant-values-container a:visited, +.all-classes-container a:link, .all-classes-container a:visited, +.all-packages-container a:link, .all-packages-container a:visited { font-weight:bold; } -.tableSubHeadingColor { +.table-sub-heading-color { background-color:#EEEEFF; } -.altColor { +.even-row-color, .even-row-color .table-header { background-color:#FFFFFF; } -.rowColor { +.odd-row-color, .odd-row-color .table-header { background-color:#EEEEEF; } /* -Content styles -*/ -.description pre { - margin-top:0; -} -.deprecatedContent { + * Styles for contents. + */ +.deprecated-content { margin:0; padding:10px 0; } -.docSummary { - padding:0; -} - -ul.blockList ul.blockList ul.blockList li.blockList h3 { - font-style:normal; -} - div.block { font-size:14px; font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; } - -td.colLast div { - padding-top:0px; +.col-last div { + padding-top:0; } - - -td.colLast a { +.col-last a { padding-bottom:3px; } +.module-signature, +.package-signature, +.type-signature, +.member-signature { + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + margin:14px 0; + white-space: pre-wrap; +} +.module-signature, +.package-signature, +.type-signature { + margin-top: 0; +} +.member-signature .type-parameters-long, +.member-signature .parameters, +.member-signature .exceptions { + display: inline-block; + vertical-align: top; + white-space: pre; +} +.member-signature .type-parameters { + white-space: normal; +} /* -Formatting effect styles -*/ -.sourceLineNo { + * Styles for formatting effect. + */ +.source-line-no { color:green; padding:0 30px 0 0; } @@ -552,23 +545,325 @@ h1.hidden { } .block { display:block; - margin:3px 10px 2px 0px; + margin:0 10px 5px 0; color:#474747; } -.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, -.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, -.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink { +.deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link, +.module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type, +.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label { font-weight:bold; } -.deprecationComment, .emphasizedPhrase, .interfaceName { +.deprecation-comment, .help-footnote, .preview-comment { font-style:italic; } - -div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase, -div.block div.block span.interfaceName { +.deprecation-block { + font-size:14px; + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; + border-style:solid; + border-width:thin; + border-radius:10px; + padding:10px; + margin-bottom:10px; + margin-right:10px; + display:inline-block; +} +.preview-block { + font-size:14px; + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; + border-style:solid; + border-width:thin; + border-radius:10px; + padding:10px; + margin-bottom:10px; + margin-right:10px; + display:inline-block; +} +div.block div.deprecation-comment { font-style:normal; } +/* + * Styles specific to HTML5 elements. + */ +main, nav, header, footer, section { + display:block; +} +/* + * Styles for javadoc search. + */ +.ui-autocomplete-category { + font-weight:bold; + font-size:15px; + padding:7px 0 7px 3px; + background-color:#4D7A97; + color:#FFFFFF; +} +.result-item { + font-size:13px; +} +.ui-autocomplete { + max-height:85%; + max-width:65%; + overflow-y:scroll; + overflow-x:scroll; + white-space:nowrap; + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); +} +ul.ui-autocomplete { + position:fixed; + z-index:999999; + background-color: #FFFFFF; +} +ul.ui-autocomplete li { + float:left; + clear:both; + width:100%; +} +.result-highlight { + font-weight:bold; +} +.ui-autocomplete .result-item { + font-size: inherit; +} +#search-input { + background-image:url('resources/glass.png'); + background-size:13px; + background-repeat:no-repeat; + background-position:2px 3px; + padding-left:20px; + position:relative; + right:-18px; + width:400px; +} +#reset-button { + background-color: rgb(255,255,255); + background-image:url('resources/x.png'); + background-position:center; + background-repeat:no-repeat; + background-size:12px; + border:0 none; + width:16px; + height:16px; + position:relative; + left:-4px; + top:-4px; + font-size:0px; +} +.watermark { + color:#545454; +} +.search-tag-desc-result { + font-style:italic; + font-size:11px; +} +.search-tag-holder-result { + font-style:italic; + font-size:12px; +} +.search-tag-result:target { + background-color:yellow; +} +.module-graph span { + display:none; + position:absolute; +} +.module-graph:hover span { + display:block; + margin: -100px 0 0 100px; + z-index: 1; +} +.inherited-list { + margin: 10px 0 10px 0; +} +section.class-description { + line-height: 1.4; +} +.summary section[class$="-summary"], .details section[class$="-details"], +.class-uses .detail, .serialized-class-details { + padding: 0px 20px 5px 10px; + border: 1px solid #ededed; + background-color: #f8f8f8; +} +.inherited-list, section[class$="-details"] .detail { + padding:0 0 5px 8px; + background-color:#ffffff; + border:none; +} +.vertical-separator { + padding: 0 5px; +} +ul.help-section-list { + margin: 0; +} +ul.help-subtoc > li { + display: inline-block; + padding-right: 5px; + font-size: smaller; +} +ul.help-subtoc > li::before { + content: "\2022" ; + padding-right:2px; +} +span.help-note { + font-style: italic; +} +/* + * Indicator icon for external links. + */ +main a[href*="://"]::after { + content:""; + display:inline-block; + background-image:url('data:image/svg+xml; utf8, \ + \ + \ + '); + background-size:100% 100%; + width:7px; + height:7px; + margin-left:2px; + margin-bottom:4px; +} +main a[href*="://"]:hover::after, +main a[href*="://"]:focus::after { + background-image:url('data:image/svg+xml; utf8, \ + \ + \ + '); +} -div.contentContainer ul.blockList li.blockList h2{ - padding-bottom:0px; +/* + * Styles for user-provided tables. + * + * borderless: + * No borders, vertical margins, styled caption. + * This style is provided for use with existing doc comments. + * In general, borderless tables should not be used for layout purposes. + * + * plain: + * Plain borders around table and cells, vertical margins, styled caption. + * Best for small tables or for complex tables for tables with cells that span + * rows and columns, when the "striped" style does not work well. + * + * striped: + * Borders around the table and vertical borders between cells, striped rows, + * vertical margins, styled caption. + * Best for tables that have a header row, and a body containing a series of simple rows. + */ + +table.borderless, +table.plain, +table.striped { + margin-top: 10px; + margin-bottom: 10px; +} +table.borderless > caption, +table.plain > caption, +table.striped > caption { + font-weight: bold; + font-size: smaller; +} +table.borderless th, table.borderless td, +table.plain th, table.plain td, +table.striped th, table.striped td { + padding: 2px 5px; +} +table.borderless, +table.borderless > thead > tr > th, table.borderless > tbody > tr > th, table.borderless > tr > th, +table.borderless > thead > tr > td, table.borderless > tbody > tr > td, table.borderless > tr > td { + border: none; +} +table.borderless > thead > tr, table.borderless > tbody > tr, table.borderless > tr { + background-color: transparent; +} +table.plain { + border-collapse: collapse; + border: 1px solid black; +} +table.plain > thead > tr, table.plain > tbody tr, table.plain > tr { + background-color: transparent; +} +table.plain > thead > tr > th, table.plain > tbody > tr > th, table.plain > tr > th, +table.plain > thead > tr > td, table.plain > tbody > tr > td, table.plain > tr > td { + border: 1px solid black; +} +table.striped { + border-collapse: collapse; + border: 1px solid black; +} +table.striped > thead { + background-color: #E3E3E3; +} +table.striped > thead > tr > th, table.striped > thead > tr > td { + border: 1px solid black; +} +table.striped > tbody > tr:nth-child(even) { + background-color: #EEE +} +table.striped > tbody > tr:nth-child(odd) { + background-color: #FFF +} +table.striped > tbody > tr > th, table.striped > tbody > tr > td { + border-left: 1px solid black; + border-right: 1px solid black; +} +table.striped > tbody > tr > th { + font-weight: normal; +} +/** + * Tweak font sizes and paddings for small screens. + */ +@media screen and (max-width: 1050px) { + #search-input { + width: 300px; + } +} +@media screen and (max-width: 800px) { + #search-input { + width: 200px; + } + .top-nav, + .bottom-nav { + font-size: 11px; + padding-top: 6px; + } + .sub-nav { + font-size: 11px; + } + .about-language { + padding-right: 16px; + } + ul.nav-list li, + .sub-nav .nav-list-search { + padding: 6px; + } + ul.sub-nav-list li { + padding-top: 5px; + } + main { + padding: 10px; + } + .summary section[class$="-summary"], .details section[class$="-details"], + .class-uses .detail, .serialized-class-details { + padding: 0 8px 5px 8px; + } + body { + -webkit-text-size-adjust: none; + } +} +@media screen and (max-width: 500px) { + #search-input { + width: 150px; + } + .top-nav, + .bottom-nav { + font-size: 10px; + } + .sub-nav { + font-size: 10px; + } + .about-language { + font-size: 10px; + padding-right: 12px; + } } diff --git a/sdk/repo/blinkup.aar b/sdk/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/repo/blinkup.aar differ diff --git a/sdk/repo/blinkup.aar.md5 b/sdk/repo/blinkup.aar.md5 new file mode 100644 index 0000000..d90af00 --- /dev/null +++ b/sdk/repo/blinkup.aar.md5 @@ -0,0 +1 @@ +de113d4b088be2dcc7aa672dec152a22 blinkup.aar diff --git a/sdk/repo/blinkup.aar.sha1 b/sdk/repo/blinkup.aar.sha1 new file mode 100644 index 0000000..33d69fd --- /dev/null +++ b/sdk/repo/blinkup.aar.sha1 @@ -0,0 +1 @@ +7bf67af7693830cdf2a8a570e96e8d1c1768e97a blinkup.aar diff --git a/sdk/repo/blinkup.aar.sha256 b/sdk/repo/blinkup.aar.sha256 new file mode 100644 index 0000000..59711ec --- /dev/null +++ b/sdk/repo/blinkup.aar.sha256 @@ -0,0 +1 @@ +5ea6af87ceb836872191ed220993745e6f22ac1e05f7424115537505220eb710 blinkup.aar diff --git a/sdk/repo/blinkup.aar.sha512 b/sdk/repo/blinkup.aar.sha512 new file mode 100644 index 0000000..b70f5ae --- /dev/null +++ b/sdk/repo/blinkup.aar.sha512 @@ -0,0 +1 @@ +26976054558615a0f5764a0eba2b64dbb0d84362c63dfab1e6049457af3c93b1b5014e07d8c1d76424448f30b864e8187493c09a1a22edef9ea7ccf1544073cd blinkup.aar diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_agent/app/build.gradle b/sdk/sample_agent/app/build.gradle index 47bc5a2..aab9316 100644 --- a/sdk/sample_agent/app/build.gradle +++ b/sdk/sample_agent/app/build.gradle @@ -1,30 +1,24 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + namespace 'com.electricimp.blinkup.sample.agent' - defaultConfig { - applicationId 'com.electricimp.blinkup.sample.agent' - minSdkVersion 19 - targetSdkVersion 30 - versionCode 1 - versionName '1.0' - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -repositories { - maven { - url "$projectDir/repo" + defaultConfig { + applicationId 'com.electricimp.blinkup.sample.agent' + minSdkVersion 19 + targetSdkVersion 34 + compileSdk 34 + versionCode 1 + versionName '1.0' + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + } } dependencies { - implementation 'com.electricimp:blinkup:6.4.5' + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) } \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/blinkup.aar b/sdk/sample_agent/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_agent/app/repo/blinkup.aar differ diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar deleted file mode 100644 index 5e533c6..0000000 Binary files a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar and /dev/null differ diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.md5 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.md5 deleted file mode 100644 index 86c58f0..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -88010c5a8c165b8c5cca48b11aa3e9ce \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha1 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha1 deleted file mode 100644 index 92fe52a..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24c7a0c737a13d5cd4aeffd1e3691a96e1f1f149 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha256 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha256 deleted file mode 100644 index 7f8e185..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -b8181331d5d337f4fe6002c4d60db394467835b4351302526ee6a9584cd2676b \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha512 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha512 deleted file mode 100644 index 84d6056..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -011852c99c63f3c4d74cfca271b2ad54672c1f70d0e7e61708ad6f6f2024ad967d8b51c24d38a5c13f7528e3e3d4d88cbbff54628b5f98d6cc4055623e05a9ad \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom deleted file mode 100644 index 4aeb1dd..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.4 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.md5 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.md5 deleted file mode 100644 index cabf7f5..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -d3b54dd9ae68f27c3b71e15bab6eb3f0 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha1 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha1 deleted file mode 100644 index 0142b03..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -15f6508d6ad8baa1e3ea46c12eae918243c87858 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha256 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha256 deleted file mode 100644 index af4038e..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -4a3df3e8c3552a8ab04c3ac56f08af3a9dd601a28a5f9ece75db008e2258e7b7 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha512 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha512 deleted file mode 100644 index dc929cc..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.4/blinkup-6.4.4.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -f60814f9161565c536d4fdde2057656d14696ebbb5aef096d16271593b37aed1e910c97ce0f2724114233f809717e8652a6f38de2cc04e54bdd1c99d396ad720 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_agent/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_agent/app/src/main/AndroidManifest.xml b/sdk/sample_agent/app/src/main/AndroidManifest.xml index 500f83d..8df8073 100644 --- a/sdk/sample_agent/app/src/main/AndroidManifest.xml +++ b/sdk/sample_agent/app/src/main/AndroidManifest.xml @@ -1,13 +1,11 @@ - - + - + @@ -15,5 +13,4 @@ - diff --git a/sdk/sample_agent/build.gradle b/sdk/sample_agent/build.gradle index 5c46473..a2a2751 100644 --- a/sdk/sample_agent/build.gradle +++ b/sdk/sample_agent/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_agent/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_agent/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_agent/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_agent/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_agent/gradle/wrapper/gradle-wrapper.properties index 6e52582..f858b52 100644 --- a/sdk/sample_agent/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_agent/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip \ No newline at end of file diff --git a/sdk/sample_countdown/app/build.gradle b/sdk/sample_countdown/app/build.gradle index 9b5fa8b..eff2353 100644 --- a/sdk/sample_countdown/app/build.gradle +++ b/sdk/sample_countdown/app/build.gradle @@ -1,30 +1,23 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - - defaultConfig { - applicationId 'com.electricimp.blinkup.sample.countdown' - minSdkVersion 19 - targetSdkVersion 30 - versionCode 1 - versionName '1.0' - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -repositories { - maven { - url "$projectDir/repo" + namespace 'com.electricimp.blinkup.sample.countdown' + defaultConfig { + applicationId 'com.electricimp.blinkup.sample.countdown' + minSdkVersion 19 + targetSdkVersion 34 + compileSdk 34 + versionCode 1 + versionName '1.0' + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + } } dependencies { - implementation 'com.electricimp:blinkup:6.4.5' + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) } \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/blinkup.aar b/sdk/sample_countdown/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_countdown/app/repo/blinkup.aar differ diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_countdown/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_countdown/app/src/main/AndroidManifest.xml b/sdk/sample_countdown/app/src/main/AndroidManifest.xml index 05c6541..bee9bae 100644 --- a/sdk/sample_countdown/app/src/main/AndroidManifest.xml +++ b/sdk/sample_countdown/app/src/main/AndroidManifest.xml @@ -1,18 +1,15 @@ - - + - + - diff --git a/sdk/sample_countdown/build.gradle b/sdk/sample_countdown/build.gradle index 66a98de..cc4bedf 100644 --- a/sdk/sample_countdown/build.gradle +++ b/sdk/sample_countdown/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,11 +15,7 @@ buildscript { allprojects { repositories { - mavenCentral() - jcenter() + google() + mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_countdown/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_countdown/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_countdown/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_countdown/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_countdown/gradle/wrapper/gradle-wrapper.properties index 6e52582..29d8ea5 100644 --- a/sdk/sample_countdown/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_countdown/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/sdk/sample_direct/app/build.gradle b/sdk/sample_direct/app/build.gradle index c2c0b84..94f2c22 100644 --- a/sdk/sample_direct/app/build.gradle +++ b/sdk/sample_direct/app/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - + namespace 'com.electricimp.blinkup.sample.direct' defaultConfig { - applicationId 'com.electricimp.blinkup.sample.direct' minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 34 + compileSdk 34 versionCode 1 versionName '1.0' } @@ -19,13 +17,7 @@ android { } } -repositories { - maven { - url "$projectDir/repo" - } -} - dependencies { - implementation 'com.electricimp:blinkup:6.4.5' + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) implementation 'com.android.support:appcompat-v7:28.0.0' -} \ No newline at end of file +} diff --git a/sdk/sample_direct/app/repo/blinkup.aar b/sdk/sample_direct/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_direct/app/repo/blinkup.aar differ diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_direct/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_direct/app/src/main/AndroidManifest.xml b/sdk/sample_direct/app/src/main/AndroidManifest.xml index 960fd87..b237d45 100644 --- a/sdk/sample_direct/app/src/main/AndroidManifest.xml +++ b/sdk/sample_direct/app/src/main/AndroidManifest.xml @@ -1,13 +1,11 @@ - - + - + @@ -25,5 +23,4 @@ - diff --git a/sdk/sample_direct/build.gradle b/sdk/sample_direct/build.gradle index 5c46473..a2a2751 100644 --- a/sdk/sample_direct/build.gradle +++ b/sdk/sample_direct/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_direct/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_direct/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_direct/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_direct/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_direct/gradle/wrapper/gradle-wrapper.properties index 30b6c26..d980bab 100644 --- a/sdk/sample_direct/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_direct/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/sdk/sample_hide_clear/app/build.gradle b/sdk/sample_hide_clear/app/build.gradle index 760aaa6..1ccf54e 100644 --- a/sdk/sample_hide_clear/app/build.gradle +++ b/sdk/sample_hide_clear/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - + namespace 'com.electricimp.blinkup.sample.hide_clear' defaultConfig { applicationId 'com.electricimp.blinkup.sample.hide_clear' minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 34 + compileSdk 34 versionCode 1 versionName '1.0' } @@ -19,12 +18,6 @@ android { } } -repositories { - maven { - url "$projectDir/repo" - } -} - dependencies { - implementation 'com.electricimp:blinkup:6.4.5' -} \ No newline at end of file + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) +} diff --git a/sdk/sample_hide_clear/app/repo/blinkup.aar b/sdk/sample_hide_clear/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_hide_clear/app/repo/blinkup.aar differ diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_hide_clear/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_hide_clear/app/src/main/AndroidManifest.xml b/sdk/sample_hide_clear/app/src/main/AndroidManifest.xml index 05c57c0..bee9bae 100644 --- a/sdk/sample_hide_clear/app/src/main/AndroidManifest.xml +++ b/sdk/sample_hide_clear/app/src/main/AndroidManifest.xml @@ -1,18 +1,15 @@ - - + - + - diff --git a/sdk/sample_hide_clear/build.gradle b/sdk/sample_hide_clear/build.gradle index 5c46473..a2a2751 100644 --- a/sdk/sample_hide_clear/build.gradle +++ b/sdk/sample_hide_clear/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_hide_clear/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_hide_clear/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_hide_clear/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_hide_clear/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_hide_clear/gradle/wrapper/gradle-wrapper.properties index 6e52582..29d8ea5 100644 --- a/sdk/sample_hide_clear/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_hide_clear/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/sdk/sample_interstitial/app/build.gradle b/sdk/sample_interstitial/app/build.gradle index b2b6af0..0ad4026 100644 --- a/sdk/sample_interstitial/app/build.gradle +++ b/sdk/sample_interstitial/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - + namespace 'com.electricimp.blinkup.sample.interstitial' defaultConfig { applicationId 'com.electricimp.blinkup.sample.interstitial' minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 34 + compileSdk 34 versionCode 1 versionName '1.0' } @@ -19,12 +18,6 @@ android { } } -repositories { - maven { - url "$projectDir/repo" - } -} - dependencies { - implementation 'com.electricimp:blinkup:6.4.5' -} \ No newline at end of file + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) +} diff --git a/sdk/sample_interstitial/app/repo/blinkup.aar b/sdk/sample_interstitial/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_interstitial/app/repo/blinkup.aar differ diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_interstitial/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_interstitial/app/src/main/AndroidManifest.xml b/sdk/sample_interstitial/app/src/main/AndroidManifest.xml index 3d6a226..bee9bae 100644 --- a/sdk/sample_interstitial/app/src/main/AndroidManifest.xml +++ b/sdk/sample_interstitial/app/src/main/AndroidManifest.xml @@ -1,18 +1,15 @@ - - + - + - diff --git a/sdk/sample_interstitial/build.gradle b/sdk/sample_interstitial/build.gradle index 5c46473..a2a2751 100644 --- a/sdk/sample_interstitial/build.gradle +++ b/sdk/sample_interstitial/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_interstitial/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_interstitial/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_interstitial/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_interstitial/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_interstitial/gradle/wrapper/gradle-wrapper.properties index 6e52582..29d8ea5 100644 --- a/sdk/sample_interstitial/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_interstitial/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/sdk/sample_strings/app/build.gradle b/sdk/sample_strings/app/build.gradle index 906b7e4..c273f5f 100644 --- a/sdk/sample_strings/app/build.gradle +++ b/sdk/sample_strings/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - + namespace 'com.electricimp.blinkup.sample.strings' defaultConfig { applicationId 'com.electricimp.blinkup.sample.strings' minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 34 + compileSdk 34 versionCode 1 versionName '1.0' } @@ -19,12 +18,6 @@ android { } } -repositories { - maven { - url "$projectDir/repo" - } -} - dependencies { - implementation 'com.electricimp:blinkup:6.4.5' -} \ No newline at end of file + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) +} diff --git a/sdk/sample_strings/app/repo/blinkup.aar b/sdk/sample_strings/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_strings/app/repo/blinkup.aar differ diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_strings/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_strings/app/src/main/AndroidManifest.xml b/sdk/sample_strings/app/src/main/AndroidManifest.xml index 829aea6..bee9bae 100644 --- a/sdk/sample_strings/app/src/main/AndroidManifest.xml +++ b/sdk/sample_strings/app/src/main/AndroidManifest.xml @@ -1,18 +1,15 @@ - - + - + - diff --git a/sdk/sample_strings/build.gradle b/sdk/sample_strings/build.gradle index 5c46473..a2a2751 100644 --- a/sdk/sample_strings/build.gradle +++ b/sdk/sample_strings/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_strings/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_strings/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_strings/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_strings/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_strings/gradle/wrapper/gradle-wrapper.properties index 6e52582..29d8ea5 100644 --- a/sdk/sample_strings/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_strings/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/sdk/sample_theme/app/build.gradle b/sdk/sample_theme/app/build.gradle index ca11f64..46d6bd8 100644 --- a/sdk/sample_theme/app/build.gradle +++ b/sdk/sample_theme/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - + namespace 'com.electricimp.blinkup.sample.theme' defaultConfig { applicationId 'com.electricimp.blinkup.sample.theme' minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 34 + compileSdk 34 versionCode 1 versionName '1.0' } @@ -19,12 +18,6 @@ android { } } -repositories { - maven { - url "$projectDir/repo" - } -} - dependencies { - implementation 'com.electricimp:blinkup:6.4.5' -} \ No newline at end of file + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) +} diff --git a/sdk/sample_theme/app/repo/blinkup.aar b/sdk/sample_theme/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_theme/app/repo/blinkup.aar differ diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_theme/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_theme/app/src/main/AndroidManifest.xml b/sdk/sample_theme/app/src/main/AndroidManifest.xml index 3d6fdf0..bee9bae 100644 --- a/sdk/sample_theme/app/src/main/AndroidManifest.xml +++ b/sdk/sample_theme/app/src/main/AndroidManifest.xml @@ -1,18 +1,15 @@ - - + - + - diff --git a/sdk/sample_theme/build.gradle b/sdk/sample_theme/build.gradle index 5c46473..a2a2751 100644 --- a/sdk/sample_theme/build.gradle +++ b/sdk/sample_theme/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_theme/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_theme/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_theme/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_theme/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_theme/gradle/wrapper/gradle-wrapper.properties index 6e52582..29d8ea5 100644 --- a/sdk/sample_theme/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_theme/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/sdk/sample_token/app/build.gradle b/sdk/sample_token/app/build.gradle index 02b792b..a28d2dc 100644 --- a/sdk/sample_token/app/build.gradle +++ b/sdk/sample_token/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - + namespace 'com.electricimp.blinkup.sample.token' defaultConfig { applicationId 'com.electricimp.blinkup.sample.token' minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 34 + compileSdk 34 versionCode 1 versionName '1.0' } @@ -19,12 +18,6 @@ android { } } -repositories { - maven { - url "$projectDir/repo" - } -} - dependencies { - implementation 'com.electricimp:blinkup:6.4.5' -} \ No newline at end of file + implementation fileTree(dir: 'repo', include: ['*.aar', '*.jar'], exclude: []) +} diff --git a/sdk/sample_token/app/repo/blinkup.aar b/sdk/sample_token/app/repo/blinkup.aar new file mode 100644 index 0000000..4e9883a Binary files /dev/null and b/sdk/sample_token/app/repo/blinkup.aar differ diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar deleted file mode 100644 index d76682d..0000000 Binary files a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar and /dev/null differ diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 deleted file mode 100644 index 7fd7866..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fbf1b09cda34d3421b3f4fbafc84e4b \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 deleted file mode 100644 index 61736a8..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b649a46a4a44a43d82fbe57d4dee2ded2a2e11f1 \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 deleted file mode 100644 index 32e4cae..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -8fdea907a51ab211a772f4870ed7c304f0238b50ccf2ae4db5dc68f8cb1fefac \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 deleted file mode 100644 index d9820f4..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -c5921132daf9609f0389b32def63a62988951f5c712adfb581650a02cf4196002941f8d0e0d6d471cc0603ae0257256b135be07dc0a0fbddddebeb0b633ae54b \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom deleted file mode 100644 index 35cdabc..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - com.electricimp - blinkup - 6.4.5 - aar - - - com.squareup.retrofit2 - retrofit - 2.4.0 - - - com.squareup.retrofit2 - converter-moshi - 2.4.0 - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 deleted file mode 100644 index 9837c2d..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -94a4d84984a414444f61a202126b905f \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 deleted file mode 100644 index 788033d..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6720e8dbda922232c53b21d00181512503597d5c \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 deleted file mode 100644 index fdc357f..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -82306d70589ddc67c13f0bdc1838f93b307b670b2b6b620c06af2e5e4a397b86 \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 b/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 deleted file mode 100644 index cee8c2c..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/6.4.5/blinkup-6.4.5.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -d01919faf45b5cd1f1d26e47c3fb7e8417061651df21dbfd431df24d953dc0befcd6db979d95183449df7d429b4bccca1abf5d481c7daf22d552c462dc28e519 \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml b/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml deleted file mode 100644 index a667a5c..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - com.electricimp - blinkup - - 6.4.5 - 6.4.5 - - 6.4.5 - - 20210729202108 - - diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 b/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 deleted file mode 100644 index 4ed867d..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -137b0d12f9a4b461371fe334b4b64a26 \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 b/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 deleted file mode 100644 index bb900bd..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -2362f3c1a80e294fc62409a0db5afe11209d3c24 \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 b/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 deleted file mode 100644 index 8c70787..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -33430f650e7c15d9ecdc0656c3f5bc9268caec0cde41b4e214b6619f35910d2a \ No newline at end of file diff --git a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 b/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 deleted file mode 100644 index c5fd7bc..0000000 --- a/sdk/sample_token/app/repo/com/electricimp/blinkup/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -2c505da570dc40f843aa58643f81165ec96f35a5e9b7374c5d89f138484022b8aef754f895b706cec9d8a83f49699f8d8a68c5214bc0f94a99d20c9b1fcdca4d \ No newline at end of file diff --git a/sdk/sample_token/app/src/main/AndroidManifest.xml b/sdk/sample_token/app/src/main/AndroidManifest.xml index afd7f81..bee9bae 100644 --- a/sdk/sample_token/app/src/main/AndroidManifest.xml +++ b/sdk/sample_token/app/src/main/AndroidManifest.xml @@ -1,18 +1,15 @@ - - + - + - diff --git a/sdk/sample_token/build.gradle b/sdk/sample_token/build.gradle index 5c46473..a2a2751 100644 --- a/sdk/sample_token/build.gradle +++ b/sdk/sample_token/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,3 @@ allprojects { mavenCentral() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sdk/sample_token/gradle/wrapper/gradle-wrapper.jar b/sdk/sample_token/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/sdk/sample_token/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sdk/sample_token/gradle/wrapper/gradle-wrapper.properties b/sdk/sample_token/gradle/wrapper/gradle-wrapper.properties index 6e52582..29d8ea5 100644 --- a/sdk/sample_token/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/sample_token/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip