Merge pull request #55 from mustafaberkaymutlu/update-dependencies

Update dependencies (Gradle, Kotlin, Android Gradle Plugin etc.)

.github/workflows/publish.yml

@@ -14,21 +14,21 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Set up JDK
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: 'temurin'
- java-version: '11'
+ java-version: '17'
 
  - name: Run unit tests
- uses: gradle/gradle-build-action@v2.7.0
+ uses: gradle/gradle-build-action@v3
  with:
  arguments: testDebugUnitTest
 
  - name: Publish
- uses: gradle/gradle-build-action@v2.7.0
+ uses: gradle/gradle-build-action@v3
  with:
  arguments: publish
  env:

.github/workflows/pull-request.yml

@@ -16,13 +16,13 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Set up JDK
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: 'temurin'
- java-version: '11'
+ java-version: '17'
 
  - name: Build
  run: ./gradlew assemble --stacktrace
@@ -32,19 +32,19 @@ jobs:
  timeout-minutes: 30
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Set up JDK
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: 'temurin'
- java-version: '11'
+ java-version: '17'
 
  - name: Run tests
  run: ./gradlew testDebugUnitTest --stacktrace
 
  - name: Upload Unit Test Reports
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  if: always()
  with:
  name: unit-test-report

CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.12.0] - 2024-06-27
+
+### Added
+
+- This changelog file
+
+### Changed
+
+- Increased minimum supported SDK from 15 to 21
+- Increased compile and target SDK from 32 to 34
+- Updated Kotlin from 1.7.20 to 2.0.0
+- Updated Gradle from 7.6.1 to 8.8
+- Updated Android Gradle Plugin from 7.4.1 to 8.5.0
+- Updated Robolectric from 4.9.2 to 4.12.2
+- Updated Truth from 1.1.3 to 1.4.2
+- Updated Fragment testing from 1.5.5 to 1.8.0
+- Updated arch. core testing from 2.1.0 to 2.2.0
+- Updated Gradle Publish plugin from 1.1.0 to 2.0.0
+- Updated GitHub Actions dependencies 

app/build.gradle

@@ -3,21 +3,29 @@ apply plugin: 'kotlin-android'
 
 android {
  namespace 'com.trendyol.medusa'
- compileSdkVersion 32
+ compileSdkVersion 34
+
  defaultConfig {
  applicationId "com.trendyol.medusa"
- minSdkVersion 15
- targetSdkVersion 32
+ minSdkVersion 21
+ targetSdkVersion 34
  versionCode 1
  versionName "1.0"
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }
+
  buildTypes {
  release {
  minifyEnabled false
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  }
  }
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
+
  testOptions {
  unitTests {
  includeAndroidResources = true

app/src/main/java/com/trendyol/medusa/MainActivity2.java

@@ -53,18 +53,19 @@ public Fragment invoke() {
  private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener = new BottomNavigationView.OnNavigationItemSelectedListener() {
  @Override
  public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
- switch (menuItem.getItemId()) {
- case R.id.navigation_home:
- multipleStackNavigator.switchTab(0);
- return true;
- case R.id.navigation_dashboard:
- multipleStackNavigator.switchTab(1);
- return true;
- case R.id.navigation_notifications:
- multipleStackNavigator.switchTab(2);
- return true;
+ final int itemId = menuItem.getItemId();
+ if (itemId == R.id.navigation_home) {
+ multipleStackNavigator.switchTab(0);
+ return true;
+ } else if (itemId == R.id.navigation_dashboard) {
+ multipleStackNavigator.switchTab(1);
+ return true;
+ } else if (itemId == R.id.navigation_notifications) {
+ multipleStackNavigator.switchTab(2);
+ return true;
+ } else {
+ return false;
  }
- return false;
  }
  };
 

gradle/libs.toml

@@ -1,21 +1,21 @@
 [libraries]
-androidGradlePlugin = "com.android.tools.build:gradle:7.4.1"
+androidGradlePlugin = "com.android.tools.build:gradle:8.5.0"
 androidXAppCompat = "androidx.appcompat:appcompat:1.1.0"
 androidXConstraintLayout = "androidx.constraintlayout:constraintlayout:1.1.3"
 androidXLifecycleCommon = "androidx.lifecycle:lifecycle-common:2.4.1"
 androidXVectorDrawable = "androidx.vectordrawable:vectordrawable:1.1.0"
 googleMaterial = "com.google.android.material:material:1.0.0"
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
-nexusPublishPlugin = "io.github.gradle-nexus:publish-plugin:1.1.0"
+nexusPublishPlugin = "io.github.gradle-nexus:publish-plugin:2.0.0"
 
-androidXArchCoreTesting = "androidx.arch.core:core-testing:2.1.0"
-androidXFragmentTesting = "androidx.fragment:fragment-testing:1.5.5"
+androidXArchCoreTesting = "androidx.arch.core:core-testing:2.2.0"
+androidXFragmentTesting = "androidx.fragment:fragment-testing:1.8.0"
 androidXTestCoreKtx = "androidx.test:core-ktx:1.4.0"
 androidXTestExtJunit = "androidx.test.ext:junit:1.1.3"
 junit = "junit:junit:4.13.2"
-robolectric = "org.robolectric:robolectric:4.9.2"
-truth = "com.google.truth:truth:1.1.3"
+robolectric = "org.robolectric:robolectric:4.12.2"
+truth = "com.google.truth:truth:1.4.2"
 
 [versions]
-kotlin = "1.7.20"
+kotlin = "2.0.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
  # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045 
+ # shellcheck disable=SC2039,SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
  # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045 
+ # shellcheck disable=SC2039,SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
 
 set -- \
  "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

medusalib/build.gradle

@@ -4,11 +4,11 @@ apply plugin: 'kotlin-parcelize'
 
 android {
  namespace 'com.trendyol.medusalib'
- compileSdkVersion 32
+ compileSdkVersion 34
 
  defaultConfig {
- minSdkVersion 15
- targetSdkVersion 32
+ minSdkVersion 21
+ targetSdkVersion 34
 
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }
@@ -20,6 +20,11 @@ android {
  }
  }
 
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
+
  testOptions {
  unitTests {
  returnDefaultValues = true
@@ -30,7 +35,7 @@ android {
 
 ext {
  PUBLISH_GROUP_ID = 'com.trendyol'
- PUBLISH_VERSION = '0.11.0'
+ PUBLISH_VERSION = '0.12.0'
  PUBLISH_ARTIFACT_ID = 'medusa'
  PUBLISH_DESCRIPTION = "Android Fragment Stack Controller"
  PUBLISH_URL = "https://github.com/Trendyol/medusa"