Prepare/1.5.0 (#318)

* specify resolver to silence warning in new rust release * update dependencies * update to version 1.5.0 * fix beta lints
stepfunc · Sep 13, 2023 · 820f46d · 820f46d
1 parent 23aa3ee
commit 820f46d
Show file tree

Hide file tree

Showing 18 changed files with 124 additions and 214 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
     "dnp3",

diff --git a/conformance/pom.xml b/conformance/pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <scala.version>2.13.4</scala.version>
-        <dnp3.version>1.5.0-rc1</dnp3.version>
+        <dnp3.version>1.5.0</dnp3.version>
         <dnp4s.version>0.1.0-SNAPSHOT</dnp4s.version>
         <scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
     </properties>

diff --git a/dnp3/Cargo.toml b/dnp3/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dnp3"
-version = "1.5.0-rc1"
+version = "1.5.0"
 authors = ["Step Function I/O LLC <info@stepfunc.io>"]
 edition = "2021"
 license-file = "../LICENSE.txt"

diff --git a/dnp3/codegen/pom.xml b/dnp3/codegen/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>dev.gridio.dnp3</groupId>
     <artifactId>dnp3-model</artifactId>
-    <version>1.5.0-rc1</version>
+    <version>1.5.0</version>
     <packaging>jar</packaging>
 
     <name>dnp3-rs model</name>

diff --git a/dnp3/src/outstation/deferred.rs b/dnp3/src/outstation/deferred.rs
@@ -81,7 +81,7 @@ impl DeferredRead {
         self.info = Some(DeferredInfo::new(hash, seq, info, iin2));
     }
 
-    pub(crate) fn select(&mut self, database: &mut DatabaseHandle) -> Option<DeferredInfo> {
+    pub(crate) fn select(&mut self, database: &DatabaseHandle) -> Option<DeferredInfo> {
         match self.info {
             None => None,
             Some(x) => {

diff --git a/dnp3/src/outstation/session.rs b/dnp3/src/outstation/session.rs
@@ -1246,7 +1246,7 @@ impl OutstationSession {
         &mut self,
         seq: Sequence,
         object_headers: HeaderCollection<'_>,
-        database: &mut DatabaseHandle,
+        database: &DatabaseHandle,
     ) -> Response {
         let mut iin2 = Iin2::default();
         let mut empty = true;
@@ -1284,7 +1284,7 @@ impl OutstationSession {
         iin2
     }
 
-    async fn handle_write_attr(&mut self, attr: Attribute<'_>, db: &mut DatabaseHandle) -> Iin2 {
+    async fn handle_write_attr(&mut self, attr: Attribute<'_>, db: &DatabaseHandle) -> Iin2 {
         // first validate that attribute can be written
         if let Err(err) = db.transaction(|db| db.inner.get_attr_map().can_write(attr)) {
             tracing::warn!("Unable to WRITE attribute: {err}");
@@ -1317,7 +1317,7 @@ impl OutstationSession {
     async fn handle_write_analog_deadbands<I, V>(
         &mut self,
         items: CountSequence<'_, Prefix<I, V>>,
-        db: &mut DatabaseHandle,
+        db: &DatabaseHandle,
     ) -> Iin2
     where
         I: Index,
@@ -1352,7 +1352,7 @@ impl OutstationSession {
     async fn handle_single_write_header(
         &mut self,
         header: ObjectHeader<'_>,
-        db: &mut DatabaseHandle,
+        db: &DatabaseHandle,
     ) -> Iin2 {
         match header.details {
             HeaderDetails::OneByteStartStop(_, _, RangedVariation::Group0(_, Some(attr))) => {

diff --git a/dnp3/src/tcp/outstation.rs b/dnp3/src/tcp/outstation.rs
@@ -259,13 +259,13 @@ impl Server {
         Shutdown
     }
 
-    async fn accept_loop(&mut self, mut listener: tokio::net::TcpListener) -> Result<(), Shutdown> {
+    async fn accept_loop(&mut self, listener: tokio::net::TcpListener) -> Result<(), Shutdown> {
         loop {
-            self.accept_one(&mut listener).await?;
+            self.accept_one(&listener).await?;
         }
     }
 
-    async fn accept_one(&mut self, listener: &mut tokio::net::TcpListener) -> Result<(), Shutdown> {
+    async fn accept_one(&mut self, listener: &tokio::net::TcpListener) -> Result<(), Shutdown> {
         match listener.accept().await {
             Ok((stream, addr)) => {
                 crate::tcp::configure_server(&stream);

diff --git a/ffi/bindings/c/CMakeLists.txt b/ffi/bindings/c/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(dnp3_c LANGUAGES C CXX)
 
-set(DNP3_BACKUP_VERSION 1.5.0-rc1)
+set(DNP3_BACKUP_VERSION 1.5.0)
 
 # Determine the architecture
 if(WIN32 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64" AND CMAKE_SIZEOF_VOID_P EQUAL 8)

diff --git a/ffi/bindings/dotnet/examples/master/Master.csproj b/ffi/bindings/dotnet/examples/master/Master.csproj
@@ -13,7 +13,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="dnp3" Version="1.5.0-rc1" />
+        <PackageReference Include="dnp3" Version="1.5.0" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/ffi/bindings/dotnet/examples/outstation/Outstation.csproj b/ffi/bindings/dotnet/examples/outstation/Outstation.csproj
@@ -13,7 +13,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="dnp3" Version="1.5.0-rc1" />
+        <PackageReference Include="dnp3" Version="1.5.0" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/ffi/bindings/java/examples/pom.xml b/ffi/bindings/java/examples/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.stepfunc.dnp3</groupId>
     <artifactId>examples</artifactId>
-    <version>1.5.0-rc1</version>
+    <version>1.5.0</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.stepfunc</groupId>
             <artifactId>dnp3</artifactId>
-            <version>1.5.0-rc1</version>
+            <version>1.5.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/ffi/bindings/java/pom.xml b/ffi/bindings/java/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.stepfunc</groupId>
     <artifactId>dnp3-parent</artifactId>
-    <version>1.5.0-rc1</version>
+    <version>1.5.0</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/ffi/dnp3-bindings/Cargo.toml b/ffi/dnp3-bindings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dnp3-bindings"
-version = "1.5.0-rc1"
+version = "1.5.0"
 authors = ["Step Function I/O LLC <info@stepfunc.io>"]
 edition = "2021"
 

diff --git a/ffi/dnp3-ffi-java/Cargo.toml b/ffi/dnp3-ffi-java/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dnp3-ffi-java"
-version = "1.5.0-rc1"
+version = "1.5.0"
 authors = ["Step Function I/O LLC <info@stepfunc.io>"]
 edition = "2018"
 build = "build.rs"

diff --git a/ffi/dnp3-ffi/Cargo.toml b/ffi/dnp3-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dnp3-ffi"
-version = "1.5.0-rc1"
+version = "1.5.0"
 authors = ["Step Function I/O LLC <info@stepfunc.io>"]
 edition = "2021"
 

diff --git a/ffi/dnp3-schema/Cargo.toml b/ffi/dnp3-schema/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dnp3-schema"
 # this version is what gets applied to the FFI libraries
-version = "1.5.0-rc1"
+version = "1.5.0"
 authors = ["Step Function I/O LLC <info@stepfunc.io>"]
 edition = "2021"
 

diff --git a/guide/sitedata.json b/guide/sitedata.json
@@ -1,4 +1,4 @@
 {
-    "version": "1.5.0-rc1",
+    "version": "1.5.0",
     "github_url": "https://github.com/stepfunc/dnp3"
 }