From 674c561e8c04da01b679a0df47a20a696744a1df Mon Sep 17 00:00:00 2001
From: Daniel Shuy <daniel_shuy@hotmail.com>
Date: Sat, 29 Oct 2022 14:16:05 +0800
Subject: [PATCH] Use BuildConfig instead of reading version from properties
 file

---
 build.gradle                                  |  9 ++--
 .../java/com/pusher/client/PusherOptions.java | 41 ++-----------------
 src/main/resources/pusher.properties          |  2 -
 3 files changed, 6 insertions(+), 46 deletions(-)
 delete mode 100644 src/main/resources/pusher.properties

diff --git a/build.gradle b/build.gradle
index 8a23bcf4..3b320d2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 buildscript {
     repositories {
         mavenCentral()
@@ -16,6 +14,7 @@ plugins {
     id "maven-publish"
     id "org.ajoberstar.github-pages" version "1.7.2"
     id "signing"
+    id "com.github.gmazzo.buildconfig" version "3.1.0"
 }
 
 def getProperty = { property ->
@@ -56,10 +55,8 @@ dependencies {
 }
 
 
-processResources {
-    filter(ReplaceTokens, tokens: [
-            version: project.version
-    ])
+buildConfig {
+    buildConfigField("String", "APP_VERSION", provider { "\"${project.version}\"" })
 }
 
 
diff --git a/src/main/java/com/pusher/client/PusherOptions.java b/src/main/java/com/pusher/client/PusherOptions.java
index 07b520f6..c116189d 100644
--- a/src/main/java/com/pusher/client/PusherOptions.java
+++ b/src/main/java/com/pusher/client/PusherOptions.java
@@ -1,18 +1,15 @@
 package com.pusher.client;
 
-import java.io.IOException;
-import java.io.InputStream;
+import com.pusher.pusher_websocket_java.BuildConfig;
+
 import java.net.Proxy;
-import java.util.Properties;
 
 /**
  * Configuration for a {@link com.pusher.client.Pusher} instance.
  */
 public class PusherOptions {
 
-    private static final String SRC_LIB_DEV_VERSION = "@version@";
-    private static final String LIB_DEV_VERSION = "0.0.0-dev";
-    public static final String LIB_VERSION = readVersionFromProperties();
+    public static final String LIB_VERSION = BuildConfig.APP_VERSION;
 
     private static final String URI_SUFFIX = "?client=java-client&protocol=5&version=" + LIB_VERSION;
     private static final String WS_SCHEME = "ws";
@@ -315,36 +312,4 @@ public int getMaxReconnectionAttempts() {
     public int getMaxReconnectGapInSeconds() {
         return maxReconnectGapInSeconds;
     }
-
-    private static String readVersionFromProperties() {
-        InputStream inStream = null;
-        try {
-            final Properties p = new Properties();
-            inStream = PusherOptions.class.getResourceAsStream("/pusher.properties");
-            p.load(inStream);
-            String version = (String) p.get("version");
-
-            // If the properties file contents indicates the version is being run
-            // from source then replace with a dev indicator. Otherwise the Pusher
-            // Socket API will reject the connection.
-            if (version.equals(SRC_LIB_DEV_VERSION)) {
-                version = LIB_DEV_VERSION;
-            }
-
-            if (version != null && version.length() > 0) {
-                return version;
-            }
-        } catch (final Exception e) {
-            // Fall back to fixed value
-        } finally {
-            try {
-                if (inStream != null) {
-                    inStream.close();
-                }
-            } catch (final IOException e) {
-                // Ignore problem closing stream
-            }
-        }
-        return "0.0.0";
-    }
 }
diff --git a/src/main/resources/pusher.properties b/src/main/resources/pusher.properties
deleted file mode 100644
index 141b9029..00000000
--- a/src/main/resources/pusher.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# The version token is filtered by the build
-version=@version@