fastlane-plugin-android_sdk_update 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1145152294d60ca477fb6802c6c14620a834cd090af6b370ad7c1f89822fcdc
-  data.tar.gz: dcccdc9fbf9eb5b798582263fc9021294f1f6bacca9eb282a3bb899257cb9b86
+  metadata.gz: 0d17e51a2ef94028d2d946195fb5236b7b005f884dd81c5f0575527efaf2cd57
+  data.tar.gz: 3c0e80a2370997872c7432291f4b98f91139b2762f1e0b540299f5027b118de5
 SHA512:
-  metadata.gz: ca1a13f1bba3006f2c97a4bfaeface0fa472df0a4caf54143d5a0e7afe11b413baaa2be32958f1840f6241bd95ee9217a1373fb7acf353e50dbbed2f7ec61c35
-  data.tar.gz: 011557cccb33381c31df5659baff3a8c88abb0310042186bab14e8ba9a1cff8faedd49a1ab6352eaaf416af780ff94ffe3d6aa057f704dca0d4f7c118b5ae44c
+  metadata.gz: 880260ed8a996015e6d5badca9f41328334daab136caea062c9aeb332723235559ca4abedae7bf3316bc17c657406d8212f52bee60b7188ef94a0f58878762d1
+  data.tar.gz: a2c635c6d36c01537a92ad68ef8ad751483e8f5482c12970941a0698ba30869f9f7565733684729fc7a9db7fba0fc71be568978b170a620a1b4ced5b2876b74d

data/lib/fastlane/plugin/android_sdk_update/actions/android_sdk_update_action.rb

@@ -3,8 +3,7 @@ module Fastlane
     class AndroidSdkUpdateAction < Action
       def self.run(params)
         # Install Android-SDK via brew
-        sdk_path = determine_sdk(params)
-        sdk_manager = File.expand_path("tools/bin/sdkmanager", sdk_path)
+        sdk_manager, sdk_path = determine_sdk(params)
 
         # Define required packages
         require 'java-properties'
@@ -51,13 +50,15 @@ module Fastlane
         # on mac
         if FastlaneCore::Helper.mac?
           require 'fastlane/plugin/brew'
-          Actions::BrewAction.run(command: "list --cask --versions android-sdk || brew install --cask android-sdk")
-          sdk_path = File.realpath("../../..", FastlaneCore::CommandExecutor.which("sdkmanager"))
+          Actions::BrewAction.run(command: "list --cask --versions android-commandlinetools || brew install --cask android-commandlinetools")
+          sdk_manager = File.realpath(FastlaneCore::CommandExecutor.which("sdkmanager"))
+          sdk_path = File.expand_path("../../../..", sdk_manager)
 
         # on linux
         elsif FastlaneCore::Helper.linux?
           sdk_path = File.expand_path(params[:linux_sdk_dir])
-          if File.exist?("#{sdk_path}/tools/bin/sdkmanager")
+          sdk_manager = File.expand_path("tools/bin/sdkmanager", sdk_path)
+          if File.exist?(sdk_manager)
             UI.message("Using existing android-sdk at #{sdk_path}")
           else
             UI.message("Downloading android-sdk to #{sdk_path}")
@@ -69,18 +70,18 @@ module Fastlane
         end
 
         ENV['ANDROID_SDK_ROOT'] = sdk_path
-        sdk_path
+        [sdk_manager, sdk_path]
       end
 
       def self.download_and_extract_sdk(download_url, sdk_path)
-        FastlaneCore::CommandExecutor.execute(command: "wget -O /tmp/android-sdk-tools.zip #{download_url}",
+        FastlaneCore::CommandExecutor.execute(command: "wget -O /tmp/android-commandlinetools.zip #{download_url}",
                                               print_all: true,
                                               print_command: true)
-        FastlaneCore::CommandExecutor.execute(command: "unzip -qo /tmp/android-sdk-tools.zip -d #{sdk_path}",
+        FastlaneCore::CommandExecutor.execute(command: "unzip -qo /tmp/android-commandlinetools.zip -d #{sdk_path}",
                                               print_all: true,
                                               print_command: true)
       ensure
-        FastlaneCore::CommandExecutor.execute(command: "rm -f /tmp/android-sdk-tools.zip",
+        FastlaneCore::CommandExecutor.execute(command: "rm -f /tmp/android-commandlinetools.zip",
                                               print_all: true,
                                               print_command: true)
       end
@@ -95,7 +96,7 @@ module Fastlane
 
       def self.details
         [
-          "The initial Android-SDK will be installed with Homebrew/Linuxbrew.",
+          "The initial Android-SDK will be installed with Homebrew.",
           "Updates for the specified packages will be automatically installed.",
           "Instructions to configure 'compile_sdk_version' and 'build_tools_version': https://github.com/NovaTecConsulting/fastlane-plugin-android_sdk_update"
         ].join("\n")
@@ -150,7 +151,7 @@ module Fastlane
                                         env_name: "FL_ANDROID_LINUX_SDK_DOWNLOAD_URL",
                                         description: "Download URL for Android SDK on Linux",
                                         optional: true,
-                                        default_value: "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip")
+                                        default_value: "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip")
         ]
       end
 

data/lib/fastlane/plugin/android_sdk_update/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidSdkUpdate
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_sdk_update
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Philipp Burgk
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane-plugin-brew
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Install required Android-SDK packages